Readd autotag and add powerline
Merge branch 'master' of github.com:aalvarado/aa-vim

Conflicts:
	_vimrc