Serious curriculum changes, hopefully the last changes to Summer 2013.  Also, some formatting changes.