django blocks instead of rails
Merge branch 'master' of github.com:shengwu/dotfiles