fix async errors
Add travis support
Merge pull request #13 from mrjoelkemp/travis

Add travis support
2.0.1
Merge commit 'a5f34778f4c770a6509f137a7c1501696fa7eed6'

Conflicts:
	index.js
Merge remote-tracking branch 'upstream/master'