From work

Signed-off-by: Mauricio Jost <mauricio.jost@activeeon.com>
Merge branch 'master' of github.com:mauriciojost/dotfiles