Merge pull request #1 from burrows-codefest/develop

moving latest hooks to master
Merge branch 'develop'
Merge branch 'develop'
add develop branch to the pre commit git hook
add grunt and fix tests
add travis file
Merge pull request #2 from burrows-codefest/feature/add_travis_ci

Feature/add travis ci