Squashed commit of the following:

commit 5e2a25ed9304ed3a3c6facb6cd9ea7adfdd29205
Author: Russell Niller <rdniller@jackrussellsoftware.com>
Date:   Wed Oct 9 10:39:35 2013 -0400

    added develop branch