Merge pull request #2 from lukekarrys/master

Change order of error and result arguments in callback
jshint for test folder
latest grunt, fixes travis build
cleanup
first install grunt-cli on travis
finishing up