Merge pull request #1 from unlooped/master

fixed some typos
Merge pull request #2 from unlooped/master

another typo
What was that doing there? Object.merge tests pass if I remove it :O
Merge branch 'master' of git://github.com/arian/prime-util
[ENH] added test for options
[ENH] setOptions merges now all attributes