Swap colon and semicolon, map <leader>h for help
Add org maps
Merge branch 'master' of https://github.com/nadavspi/dotfiles

Conflicts:
	emacs.d/init.el