[master, March 3 2013]

- Reset the database, cleaned some obsolete data up.