Merge pull request #326 from b97pla/master

Update db credentials to match config
Remove experimental directory (kept in halo-experimental branch)
Merge pull request #327 from guillermo-carrasco/master

Remove experimental directory (kept in halo-experimental branch)
fix path when merging configs