BU-CS673/bubolo — pull request #205 by ethanms (2014-03-22 18:50:41+00:00)
Title: Pulling cleanup and changes from Ethan into Ethan-Staging

Cleaned up and expanded comments