Fix bundle install
Merge branch 'master' into fix

Conflicts:
	Vagrantfile
Merge pull request #5 from hiroraba/fix

Fix bundle install