Merge pull request #1 from majdal/master

merge majdal/modex into my own copy
Merge branch 'master' of github.com:kousu/modex
Plot.ly
Annotation collaboration tools.
Websockify
Online code editor examples, for sandboxing inspiration
Merge pull request #2 from bruzen/databased

Databased
typo
More viz libraries

Tips from [the dat folks](https://github.com/maxogden/dat/issues/133)
Clean up previous commit
durp
Merge branch 'databased' of github.com:kousu/modex into databased

Conflicts:
	wiki/Platforms-and-APIs.md
Cleaner description of the postgres replication idea
Merge pull request #6 from kousu/databased

Databased