Merge branch 'master' into migrate-to-rails4

* master:
  We want Ruby 1.9 syntax
  new settings
Update rails version
Update rails version to 4.1.5
Merge branch 'master' into migrate-to-rails4.1

* master:
  ignoring patch number
  2.0.0

Conflicts:
	tematica.gemspec
Merge pull request #16 from Soluciones/migrate-to-rails4.1

Migrate to rails4.1