Merge branch 'oja-patch-4'
Merge pull request #4 from OliverJAsh/oja-patch-1

Use amdefine, allowing Argonaut to be required by Common JS
Merge remote-tracking branch 'origin/master'
Add tests