fixing conch behaviour when sourced

Conch used to exit instead of returning
Merge branch 'master' of github.com:VolatileDream/dot-files