increased number of retries for suggested nick
Fixing sound bugs. adding mock storage for tests.
Increasing retries with better approach for avoiding nick collisions.
Adding the mathutil file.
Merge branch master
timeout changes
changed delay time
Spacing tweaks
fixed duplicate tweet message issue
Merge branch 'master' into timeout-changes

Conflicts:
	push-notification/push-notification.js
	test/selenium/account-settings-test.js
	test/selenium/meta-area-test.js
	test/selenium/room-settings-test.js
Fixing the invalid params error in sign-up.
Adding the error and payload to callback when no event listener is attached.
Merge pull request #361 from scrollback/bug-fixes

Interesting approach with nick attempts.
Merge pull request #402 from scrollback/timeout-changes

Timeout changes
Merge pull request #408 from scrollback/smallfixes

Spacing tweaks in /me
Merge pull request #409 from scrollback/twitter-fix

fixed duplicate tweet issue
Merge pull request #411 from scrollback/invalid_params

Invalid params
merge master into branch