Merge pull request #3 from dotch/master

added karma for tests and updated gulpfile