utlAplugin
Add mapping <leader>q :q<cr>
Add mapping <leader>= <c-w>=
Add mapping <leader>: @:
javascriptamappings
Add org-mode todo options
Add/change mappings for org-mode
vim-airline: remove tagline integration
vim-airline: set font
Add a lot of plugin integration toggles
merginal: add mapping to open up branch list
tmuxline: add preset
nari.vim: set colorscheme to lucius
alias.zsh: add 'join' alias/function
aliaz.zsh: fix gcm alias
tmuxline
Merge branch 'master' of https://github.com/edlandm/dotfiles

Conflicts:
	zsh/alias.zsh