DT-3 Finishing Vagrant dev setup
Merge commit '54dcb4f'