repo 2
Merge branch 'master' of github.com:ctrlok/vimconfig

Conflicts:
	andrew_test