Merge branch 'master' into migrate-to-postgresql

* master:
  fixing rspec version
  We want Ruby 1.9 syntax
  new settings

Conflicts:
	news_tematica.gemspec
Merge pull request #37 from Soluciones/migrate-to-postgresql

Migrate to postgresql
PostgreSQL
Merge branch 'master' into migrate-to-rails4

* master:
  PostgreSQL

Conflicts:
	news_tematica.gemspec