c0b667727cb95eae2c48e1618889e5e0374ab022
Merge branch 'master' of git://github.com/halorgium/mephisto into halorgium/master
4aefe96753e521d710c2b9db4bc6fa898351a285
removed spec crap and added notes on a js client
a06088a7dc7ffb5a5029b4c6802377317702161e
tweaked some junk