pulling feature branch(es) into "develop" branch

Going to try using the master branch for official release history, and "develop" as the integration branch for features.