Add stuff from work...  rework some stuff to prettify
Update deploy to work
Make screen start login shells