fixed some code format issues w/ README
Merge pull request #48 from pdehaan/newerreadme

fixed some code format issues w/ README
Merge branch 'master' of github.com:jrconlin/wmf

Conflicts:
	README.md
Back out ws sig function

* Error with local calls returning localhost not host IP
Merge pull request #100 from jrconlin/master

Back out ws sig function
Fixed ws id code

* Using a hash of the device + userid
* Remote IP is unreliable with proxy and websockets
* Reformatting code to collect private vs public for handlers
Merge pull request #101 from jrconlin/master

Fixed ws id code
Fixed issue where the device wasn't being passed through to the erase confirmation.
Merge pull request #102 from mozilla-services/fix-broken-erase

Fixed erase
Fix to socket updates

* Fix to use correct deviceID when generating map
* Added new items to config-sample.ini
* Added stripper to getDevFromUrl
Merge pull request #104 from jrconlin/master

Fix to socket updates
fix up audience extractor for fxa & persona

* Pulled out audience from assertion to own function
* Now handles fxa "audience" and persona "aud"
Merge pull request #106 from jrconlin/master

fix up audience extractor for fxa & persona