ignore ./vagrant.
Merge branch 'master' into browser