ci target, removed karma from default grunt targets
changed travis branches
Merge branch 'travis-testing'