refactoring + added notes about vagrant
Merge branch 'master' of github.com:balle/balu-wiki