Merge branch 'master' of github.com:sinelaw/xml-to-json into cygwin

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