Merge pull request #54 from ngoldman/master

Add Travis CI
fix bower conflicts