Vanity & enable travis emails
Update tests for `return`
Fix for #171