Squashed commit of the following:

commit b914f5ee662f938eed9ec99c099b793a46ef964f
Author: Jim Kalafut <jim@kalafut.net>
Date:   Thu Jan 10 13:16:16 2013 -0800

    misc content