Merge branch 'hotfix/0.1.2'
require vagrant 1.5+ since plugin management has changed
Merge branch 'hotfix/0.1.3' into develop