Clarify flight_price question, change valid? method to json_valid? for semantics.
Fix merge conflict in README.md