Fixes for lock and emacs

The lock script was updated to work with gnome 3.10 and the emacs configs slowing becoming more usable and less buggy.