removed a pointless conditional
Merge branch 'master' of https://github.com/Goggles/Expedition