Fixes #182 and #131#211

Open

amontalban wants to merge 3 commits intodevopsgroup-io:masterfrom

amontalban:master

Commits on Jul 8, 2016

Fix for devopsgroup-io/vagrant-hostmanager#182 devopsgroup-io/vagrant-hostmanager#131
amontalban
committed

Commits on Aug 11, 2016

Merge remote-tracking branch 'upstream/master'
amontalban
committed

Commits on Jan 17, 2017

Merge remote-tracking branch 'upstream/master'
amontalban
committed