Fixed a conflict that I accidentally committed
Updated the Gemfile to include the proper gems
Fixed a bunch of signedness warnings that cropped up on Linux (oddly, cygwin doesn't flag those)