add django template recognition for django snipmate
Merge branch 'master' of github.com:NickTomlin/dotfiles
only use rbenv if installed
Merge iMac
change bindings for tmux prefix, and affected Nerdtree binding in vim
syntastic config
add python modules to path