checking in changes from GDC 2014 and Dissertation Defense