Laptop stuff
Merge branch 'master' into HEAD

Conflicts:
	autoload/pathogen.vim