Merged the 2 DBs in 1 called elpaso.sqlite and update some files to reflect that change