ansible_inventory config
playbook / config updates
Merge branch 'master' of github.com:crsmithdev/coreos-infra

Conflicts:
	vagrant/config.rb
config update
gitignore
Merge branch 'master' of github.com:crsmithdev/coreos-infra
production tests