Better error handling
Merge branch 'master' of https://github.com/revolutionarysystems/analytics

Conflicts:
	src/analytics-client.js