make vagrant not ruin things
Merge branch 'feature/login-register'