Removed redundant tunnel stuff from profile.
Added fenrir to hosts.
Merge branch 'master' into mac