fixed token authentication generation
Merge pull request #132 from smcgregor/master

fixed token authentication generation
updated seedfile
updated gems
Merge pull request #133 from smcgregor/master

updated gems
updated privly applications
added karma example
added readme for running Karma
working TravisCI Sauce Labs Karma testing
updated Gemfile
made travis karma file detect whether Travis launched it
removed Karma test runner
updated privly-applications submodule
updated privly-applications bundle
plugged .travis.yml into submodule
Changed merge strategy for .travis.yml file to 'ours'
updated gemfile
updated privly-applications submodule
removed JS unit tests from .travis,yml
Merge pull request #135 from smcgregor/Continuous-Integration

Continuous integration