Pull request to fredpalmer/master from fredpalmer/develop

Please pull these commits into fredpalmer/master.  Here is the latest commit message:

*"Commenting out the debugging directive"*