updated docker with vagrant support
fixed typos
Merge commit 'd4ee27cb8dca9d4b66d1dd087fb6c2e6c7fca072'