ec2 ohai hack
add/remove hosts file no longer part of main tasks
cleaner workaround for ec2 hints
Merge branch 'pw/hosts'
merge master
force vagrant to read pivotal.pem