Dec 2014

I'm trying to bring the changes from tesserae's dec_2014 branch, which represents the lab computer, to my own tesserae:master branch, which is from last summer.