Cleaning up some blemishes in the serializer code
Performing lots of serializer code cleanup
Creating a 'json' package; refactoring

It's my hope that we eventually decouple our serialization from JSON.  I think this is a good first step.
upgrade to Play 2.1.2 and Scala 2.10.2

just staying current with what's in Homebrew
Fix typo in color serialization
Merge branch 'master' into splitjs