Change Powerline for airline, add jinja and venv
Merge branch 'master' of github.com:csand/dotfiles

Conflicts:
	vimrc
vimrc changes
Merge branch 'master' of github.com:csand/dotfiles