golang stuff, gopath,
.mc-lists.el is generated automatically
Merge branch 'master' of https://github.com/bowenl2/dotfiles

Conflicts:
	.gitignore
	home/.emacs
	home/.emacs.d/.mc-lists.el
	home/.emacs.d/elpa/archives/gnu/archive-contents
	home/.emacs.d/elpa/archives/marmalade/archive-contents
	home/.emacs.d/elpa/archives/melpa/archive-contents