updated for 1-22-13
Merge branch 'master' of github.com:jjasghar/dotfiles