Merge virtuoushub:developer into Hornswaggler:develop

@Hornswaggler, I have been using [git flow](http://nvie.com/posts/a-successful-git-branching-model/) as my branching model. It has a pretty nice [git extension](https://github.com/nvie/gitflow) and [cheatsheat](http://danielkummer.github.io/git-flow-cheatsheet/).

I am not sure how you want to handle this repository. It originally only had a master branch, so I assume that you were/are not using git flow in your local environment. I'd suggest looking into git flow as it makes a lot of sense and can help with many things such as feature addition.

With that said, I created this develop branch and would like for it to mirror what I currently have in my fork's develop branch.