God knows
what is this i don't even
Merge branch 'master' of github.com:alanzoppa/dotfiles

Conflicts:
	.atom/.node-gyp/.atom/.apm/underscore-plus/.cache.json
	.atom/.node-gyp/.atom/.apm/underscore-plus/1.0.5/package.tgz
	.atom/.node-gyp/.atom/.apm/underscore/.cache.json
	.atom/.node-gyp/.atom/.apm/vim-mode/0.8.0/package.tgz
	.atom/config.cson
	.atom/packages/vim-mode/node_modules/underscore-plus/package.json
	.atom/packages/vim-mode/package.json
merge fix