removed unneeded --distribute from mkvirtualenv line and moved workon line to a more appropriate place.
Merge branch 'master' into sami
Merge branch 'sami' into phsen