i work on dev26 now
Merge branch 'master' of github.com:bukzor/buck_dotfiles
Merge branch 'master' of github.com:bukzor/buck_dotfiles
fix virtualenvwrapper support
little things
merge from work
Merge branch 'master' of github.com:bukzor/dotfiles

Conflicts:
	.bash_aliases
jwilkins owned my key :(
markdown support
ssh-dev
Merge branch 'master' of github.com:bukzor/dotfiles
better syntastic pylint
merge from buck/master
merge from buck/work to buck/master
Merge branch 'master' of github.com:bukzor/dotfiles

Conflicts:
	.bash_aliases
	.bashrc
	bin/git-prune-branches
Merge remote-tracking branch 'buck/work'
add vimlint
remove VimClojure: http://usevim.com/2013/01/02/vimclojure/
little
wtf