fix gitignore
restore public dir
add vagrant and foreman
Merge branch 'vagrant' into development

* vagrant:
  add vagrant and foreman
  restore public dir
  fix gitignore