Merge branch 'master' of github.com:btelles/angular
add karma config, and setup for testing with angular-mocks