OSX tyr 2013-11-08.
Merge branch 'master' of github.com:tyleretters/dotfiles

Conflicts:
	.bash_profile