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
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