Bugfix on joining channels and getting channel data
Merge branch 'master' of github.com:Adjective-Object/ocean-irc

Conflicts:
	localserver.py
Merge branch 'master' of github.com:Adjective-Object/ocean-irc
Weirdness is happening
Merge branch 'master' of github.com:Adjective-Object/ocean-irc
Merge branch 'master' of github.com:Adjective-Object/ocean-irc
Fixing icon and timestamp bugs

In longer form:
Icons:
 * JSON field for icons was 'image' in localserver but 'icon' in client
   behavior api
 * @ sign in front of chanops from the userlist was causing their icons
   to be set to placeholder because messages are sent without the @ so
   the names wouldn't match
 * However, scrubbing the @ on server side means we can't tell who ops
   are on the client.

Timestamps:
 * Javascript seems to expect timestamps that are 1/1000 of UNIX
   timestamps. To correct for this, localserver.py is now dividing
   all client-bound message timestamps by 1000 while the clientapi
   javascript has remained unchanged.