Consolidated startup script
Merge branch 'master' of github.com:johnbenjaminlewis/dotfiles

Conflicts:
	.profile