DB connection and reorder
Merge branch 'master' of github.com:mauromorales/dotfiles