Fixed up the gemspec and gemfile. Also added a few things to the Token model