Upsell Whidbey
Fix options references in the README.
Simplify merge-options function and strict-mode tests.
Default map commas, add coll separator, and update README.
Set patch version 0.6.2
Merge branch 'release-0.6.2'

Conflicts:
	README.md
	project.clj