Updated to rails 3.2
Merge branch 'master' into update-to-rails-3.2

* master:
  fixing the test as code does it
  dummy as Rankia/Verema
  updating Gemfile.lock

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/adding-travis-v2' into update-to-rails-3.2

* origin/adding-travis-v2:
  changing old trick with a new one. Now rspec (2.14.1) works.
  this database must be setup, because it needs a lot of tables from Rankia/Verema
  adding Travis building image
  adding Travis
  unversioning the Gemfile.lock
  simplifying and using 'random' (because `rand` doesn't works)
  deleting spork/guard and deleting unused gems
  deleting unused things
  deleting blank lines
  `rake` launches rspec tests as default
  simplifying the gitignore
  dropping rdoc

Conflicts:
	Gemfile.lock
	spec/spec_helper.rb
Merge branch 'master' into update-to-rails-3.2

* master:
  Version change
  Changing enviar_newsletter_a_suscriptores_tematica call by enviar_newsletter_a_suscriptores_suscribible (new Sendnews API)
  news_tematica is open!
  Removed unused stuff
  Stop using suscripciones
  Renamed a_sendgrid! to enviar! as it revealed implementation details
  Updating Gemfile.lock
Remove deprecation warnings
Style fixes
Updated ruby version
Downgrade ruby to 2.0.0
Update to rails 3.2.18
Merge branch 'master' into update-to-rails-3.2
now we are using Ruby 2.1.2
Merge pull request #35 from Soluciones/update-to-rails-3.2

Update to rails 3.2