changed the names of methods in models to the rails conventions
Merge branch 'rails_convention' of git://github.com/zeitan/QuienGobierna into zeitan-rails_convention

Conflicts:
	app/models/deputy.rb
	app/models/ife.rb
Merge branch 'zeitan-rails_convention'
fix typo