Merge pull request #27 from arielspear/tian

Tian
Cleaned up use of this/self for #28.
Moved some code.
Some comments to document stuff.
Slight cleanup to models file.
Moved routing stuff.
Renamed content to message.
Some todos.