some stuff
Merge branch 'master' of https://github.com/geoffberger/env
Updated gitignore to not include .pyc files
Removing compiled python files.
Resolved conflict