Merge pull request #22 from apardo/master

Actualización 20140519
Merge branch 'master' of https://github.com/edx/configuration
Merge pull request #25 from apardo/master

sync
Merge branch 'staging' of github.com:apardo/configuration into staging
Merge branch 'master' of github.com:iaen-edu/configuration into staging