Consolidate Sqlite3 and Master branches

This consolidation removes the need for the separate Sqlite3 branch.