Lotexify a lot
Fix whitespace alignment in options list
Fix bad error message
Restructured options: changed defaults for nulls, and multiline when not using arrays; added option to not collapse text nodes into a single string property; added tests
README: Update to reflect changes in default options
README: Update to reflect changes in default options (more fixes)
Version bump to 0.1.1.0
removed unrelated file
Add feature: ability to selectively decide if a text node should be collapsed using a regex
Merge branch 'master' of github.com:sinelaw/xml-to-json into cygwin

Conflicts:
	src/xml-to-json.hs
	xml-to-json.cabal