adds alias for SimpleHTTPServer
adds git_diff_wrapper
Merge branch 'master' of github.com:laidback/dotfiles