Cleanup
Merge branch 'master' of github.com:xaccrocheur/kituu

Conflicts:
	.emacs