Agogo diffs
Merge branch 'master' of https://github.com/mkapolka/dot_files

Conflicts:
	home/.vimrc