Merge branch 'release/0.1'
moar gitignore
Merge branch 'hotfix/0.1.1' into develop