Changed style of import to a one-liner
Merge branch 'master' of https://github.com/spree/zendesk_endpoint

Conflicts:
	.gitignore