trying to make .profile a little more cross-platform
Merging conflict
Merge branch 'master' of git://github.com/djtriptych/dotfiles

Conflicts:
	dotfiles/.profile