Initial model system
Merge branch 'master' of git://github.com/socketstream/socketstream-0.4