Dump develop into master

From here on out we'll be using gitflow...