Squashed commit of the following:

commit c6c0451cfa885a7fd55df0b93765771582e25d45
Author: Karl Akert <kpakert@gmail.com>
Date:   Thu Mar 14 16:43:44 2013 -0500

    hopefully will fix my branch structure
Merge branch 'develop'