merge in changes from master
added Gruntfile.js because I'm using it in the test directory to tell me my dependency file locations