Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
Use the new Ruby 1.9 hash syntax.<br>Inconsistent indentation detected.