Fix PR deploying in travis.yml
Merge pull request #13 from theodi/feature-update-rails

Update dependencies
Merge pull request #14 from theodi/feature-12-fix-jsonp

Fix JSONP
Merge pull request #15 from theodi/feature-4-add-distance-to-radius-responses

Add distance to Radius API responses
Merge pull request #16 from theodi/feature-6-add-boundaries

Add Parishes and Electoral Districts
Merge pull request #17 from theodi/bugfix-dont-display-boundaries-for-ni-postcodes

Don't display parish or electoral districts for Northern Ireland postcodes
Merge pull request #18 from theodi/bugfix-style-weirdness

Some serious weirdness going on
Merge branch 'master' of github.com:theodi/uk-postcodes into feature-continuous-deployment

Conflicts:
	.travis.yml