Update gems and add knife-spork
Merge upstream w/ fixed Gemfile.lock