Adapted configs
Merge branch 'master' of https://github.com/sasha-s/coreos-vagrant

Conflicts:
	config.rb
	user-data