Updated .vimrc

- add force colors for jellybeans and iterm2
- add powerline settings
- moved colors to be Vundle managed
Merge branch 'master' of github.com:benjamin-chang/turnt-octo-robot

Conflicts:
	.vimrc