Revert "Try get grunt to run only karma:unit by ensuring there are no default task conflicts."

This reverts commit 7b349e62712c75032951ca3f5a239a37176e2cdd.
Revert unnecessary commit.
Fix travis.yml file to run correct command.