Rewriting exit to not exit, but return

Let's see if travis likes this too.