Cleanup
Merge branch 'develop'
More cleanup
As you can see, I am still learning git.