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