Merge branch 'release/0.1.0'
fix rewrite stuff...

this is still kind of a temporary solution. It will work on
vagrant for the time being though.
Merge branch 'hotfix/0.1.1' into develop

bumping develop to 0.2.1-dev (hmm... probably the wrong
semver move, I'm to lazy to revert now ;))