trying to get develop to be the default branch to commit code to, then
pull in larger updates.
Merge branch 'master' of https://github.com/Apocrathia/AquaPi into develop
Merge branch 'develop'