Summer 2013 Changes

This is the "completed" work from the summer, which should probably get merged into the master before the fall.