Merge pull request #5 from rjaffe/rev1

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

NOJIRA: Remove temporary comments
Merge branch 'master' into rev1