adding yaml to vim, updating profile w/ aliases
removing rbenv
updates
some work from simon
mo changes
Merge branch 'master' of github.com:kerinin/environment

Conflicts:
	.profile_shared
making osx profile
adding function
updates from laptop
Merge branch 'master' of github.com:kerinin/environment

Conflicts:
	.profile_shared
updates from insights
Merge insights:/home/rmichael/environment
Merge branch 'master' of gh:kerinin/environment
Merge branch 'master' into from_alpha

Conflicts:
	.bash_profile
	.vimrc
	bash_prompt.bash