NOJIRA: Remove temporary comments
Merge pull request #6 from rjaffe/master

NOJIRA: Remove temporary comments
Merge branch 'master' into rev1
Merge pull request #7 from rjaffe/rev1

NOJIRA: Remove temporary comments