Added Bower File
Brought versioning up to date
Merge branch 'gh-pages' into bower
Updated the files so they are distinguishable in bower

There were some collisions due to hooking this up in grunt, it's fixed now.