Merge End-Semester Expo changes into master

So we can start hacking away again during the Fall 2014 semester :-)