Merge pull request #379 from magee/master

minor typo corrections and formatting changes to documentation
Unify JSDoc tags for predicate functions

Remove signatures from `@param` JSDoc tags since we now have the separate `@sig` tag.
Add descriptions to predicate function params.
Merge pull request #380 from fson/patch-1

Unify JSDoc tags for predicate functions
Remove .orig conflict files

These were added in merge d8ee88b81ec7a575911e54ffb204e3fa43a24e2a
Merge pull request #384 from fson/remove-orig-files

Remove .orig conflict files
Add *.orig to gitignore
Merge pull request #385 from fson/gitignore

Add *.orig to gitignore