Merge pull request #29 from wmh/master

Modified gruntfile to explicitly concatenate js in order