b5f1554caf
Squashed commit of the following:
commit 60be1b2d1d
Author: Raphael Mudge <rsmudge@gmail.com>
Date: Wed May 30 19:43:07 2012 -0400
Armitage 05.30.12
A small collection of bug fixes.