Cleaning up master. All code for this semester is in Fall 13 branch