Included shifty code but commented out
Need to remove tsgman and enable shifty
Added ddefault client keys
Some cleaning of files

- not needed files removed
- remnants from old configurations removed