Add Odin SSH Host Key
Add virtualenvwrapper postactivate hook

This changes the color of the current virtualenv to match the current
branch, just to make it more obvious that it's distinct from the path
section.
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add Heimdall's host key

Conflicts:
	staging/.ssh/known_hosts