Merge pull request #2 from RussTheAerialist/master

Adding bower support
update bower.json style
Merge pull request #1 from joinspoton/master

Trying to merge in the official changes