comment some keymaps out for now
flip screen orientation
fix control
add android to PATH
bashmarks
new push thing in git
out with the old bs servers
.vim plugins
reenable colemak bindings
titlebar clock
rm cruft
fix ssh config
fix xinitrc
add en_US locale to bashrc
Revert "add en_US locale to bashrc"

This reverts commit ca158e4457d43f1de3f8a563de9f4b9de1b84073.
inline the statusbar in xinitrt c
Merge branch 'master' of github.com:nlacasse/dotfiles into fibonazi

Conflicts:
	.bashrc
	.dwm_statusbar
	.vim/.netrwhist
	.vim/doc/clojure.txt
	.vim/ftdetect/clojure.vim
	.vim/ftplugin/clojure.vim
	.vim/indent/clojure.vim
	.vim/syntax/clojure.vim