Squashed commit of the following:

commit e6c3ad4e49d3dec4698b558af6ea847c5b25f77b
Author: Kevin McGrath <kcmcg923@gmail.com>
Date:   Wed Sep 3 10:02:55 2014 -0700

    Cleanup