Merge pull request #233 from bepetersn/v2.0-dev

added CORS header to 2.0 API responses as per issue #232
Merge pull request #234 from bepetersn/v2.0-dev

put CORS header in the right place
add travis conf to v2.0-dev branch; fixes #268