Updated 2014-03-31
Merge branch 'master' of github.com:raziel1121/env

Conflicts:
	osx/.bash_profile