Merge pull request #59 from gebagley/master

Finally got things merged.....
Added a quick fix for the bower.json