Made the emacs server start regardless of if you are running the
pseudo-daemon.  That way org-protocol works as well.
Merge branch 'master' of github.com:mlf176f2/EmacsPortable.App