Base code
Merge https://github.com/isaiahgarza/CompVis-Spring13