Update readme
Reference karma bin file instead of global
Merge pull request #1 from gconsidine/readme

Update readme
Update readme.markdown
Merge pull request #2 from gconsidine/travis-ci

Update grunt task to include bower install
resolve merge conflict