Cleaning up code - letting yajl do more heavy lifting for us.  Also removing version change since that will occur during release.