Started working with virtualenv properly.
Virtualenv stuff
Merge branch 'master' into better_logging