Consolidate Sqlite3 and Master branches

No additions or features added here except those already present in either existing Master or Sqlite3 branches.  This consolidation removes the need for the separate Sqlite3 branch.