added nginx aliases
Merge branch 'master' of github.com:ryanatk/setup

Conflicts:
	bash_profiles/private.bash
set vim as default editor ool de time