Remove some comments

This commit is really just to test pulls back and forth to Kelly's fork
Merge pull request #2 from mniebling/master

Update from master to test how it works