Simplified settings

* tailored for self, sorry :D

Add tabs to secondary screen

* Also add mod-shift-j and mod-shift-k swap behavior

Removed master hide and show