testing setup
mv travis.yml .travis.yml
grunt-cli added
merge conflicts resolved
tests pass now
NOW the tests pass
merge conflict resolved
Merge pull request #17 from bchiatt/angular

testing setup