merge from work
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/tmux-detach-others
add chromebook pubkey
merge from work branch
clojure support
README
merge from master
merge from work
git lol
Merge branch 'master' of github.com:bukzor/dotfiles
merge from origin/master
Merge branch 'master' of github.com:bukzor/dotfiles

Conflicts:
	.bashrc
better scrolling keys
merge from master