Update conventions further
Update readme
Merge remote-tracking branch 'origin/master'

Update from vagrant box