Adding status line to vim config
Added virtualenvwrapper shell startup script to bashrc
Merge branch 'master' of https://github.com/terrymunro/dotfiles

Conflicts:
	.vimrc