some layout changes
added vagrant example deployment file
Merge branch 'jos-fork'
* fixes