Added s

- Json serialization, string support
- Removed cruft
- Fixed CML to work with the updated stuff
- Preparing to merge with the master branch, I'm basically done with
networkx stuff