gitignore *.pyc
Merge branch 'master' of github.com:echohead/env