+default to ubuntu user on AWS
sans initial git
no longer prefer fish
no server splsh by default
+git purge: git reset --hard HEAD && git clean -dfx
+master alias: git checkout master
 NO MORE FISH
Merge branch 'naggie'

Conflicts:
	provision/ubuntu-12.04-server
	provision/ubuntu-13.10-desktop
	provision/ubuntu-14.04-desktop
	provision/ubuntu-14.04-server