Version bump
Merge branch 'dev'
Merge branch 'master' of ssh://github.com/grantgarcia/simfile