bugfix conditional in if statement

From the fish docs (http://ridiculousfish.com/shell/user_doc/html/commands.html#if):
In order to use the exit status of multiple commands as the condition of an if block, use begin; ...; end and the short circuit commands and and or.
Merge pull request #3 from databus23/patch-1

bugfix conditional in if statement