new settings
We want Ruby 1.9 syntax
Merge pull request #14 from Soluciones/unifying-repos

new settings
Merge branch 'master' into migrate-to-postgresql

* master:
  We want Ruby 1.9 syntax
  new settings