Turning this into a Bower package
Merge remote-tracking branch 'origin/master'