basic functionality up and running
Merge branch 'master' into chef-vagrant