Merge branch 'development'
Merge branch 'development'
Adding vagrant config and bootstrap for dev environment
Merge branch 'master' into development