Adding back Gemfile.lock

Heroku made think the lock wasn't important to commit.
Updating Gemfile.lock for non-Windows boxes.
Updating NPM DevDependencies
Asset changes due to new NPM modules.
Update bower packages.
Merge pull request #35 from TheSeg/master

Updates to Gems, NPM, and Bower.