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'