Add travis config file
Merge pull request #13 from groupon/jk/travis

Add travis config file
Extend options.logData instead of losing the content
Make sure travis uses our custom build script to verify a proper coffee compilation
Merge pull request #16 from groupon/ab/travis-build

Make sure travis uses our custom build script
Merge pull request #14 from groupon/ab/extend-bug-fix

Extend options.logData instead of losing the content
Version 2.1.1
Simplify merging while making sure we dont effect existing objects
Merge pull request #18 from groupon/ab/merge-failure

Simplify merging while making sure we dont effect existing objects
Version 2.1.2
Merge remote-tracking branch 'origin/master' into jk/promise-support

Conflicts:
	.travis.yml
	lib/gofer.js
	lib/helpers.js
	src/gofer.coffee