Middle commit
Git-troubles
Antigen fixed
Misc changes
Merge branch 'master' of github.com:ErikBjare/dotfiles

Conflicts:
	.gitmodules
	home/.zshrc
Removed strange folder...