Updated README to remove reference to roles.yml
smarter rc.local stuff
testing
testing
bootstrapping
Merge remote-tracking branch 'upstream/master' into bootstrap
Merge branch 'bootstrap' of github.com:usernamenumber/provision into bootstrap