A lot of shifting over.
Merge branch 'develop'

Conflicts:
	.bash/bash-it
	.bashrc
	.rbenv
	.vim
	.vimrc