Merge branch 'release-0.2.1'
added modman
Bump
Merge branch 'hotfix-0.2.2' into develop