smp should go both ways

fixes for #465
Merge pull request #474 from arlolra/smp

smp should go both ways
Style tweak
Merge pull request #477 from FredericJacobs/master

Long overdue Tor Integration for Mac (issue #354)
Add npm debug to gitignore
Revert "Merge pull request #477 from FredericJacobs/master"

This reverts commit 82690274f672ae0eb8fb8f11f8d7c555531b2b9b, reversing
changes made to c79e992e8e64186dfd08e9de21d2675d73555a0d.
Update .gitmodules
Reverting revert
Adding copy build phase for xcodebuild command
Merge branch 'master' of github.com:FredericJacobs/cryptocat