Added buildserver.
Removed screen locking when suspending as systemd takes care of that now.