Added rbenv to bash profile.
Moved colorscheme declaration.
Use two spaces for ruby indentation.
Added plugin for HAML and Slim.
Merge branch 'master' of github.com:ryanc/dotfiles

Conflicts:
	.bash_profile