Add screen settings and move shell files together
Remove keychain support and extra Java options
Use user install of virtualenvwrapper