fix bower conflicts
Merge pull request #71 from ngoldman/master

fix bower conflicts