Adding testing bits to Gemfile, cleaning up some style issues