Merge branch 'master' of sc:awesome into desktop

Conflicts:
	tags.lua

rc.lua

@@ -1,6 +1,7 @@
 terminal = "sakura -e screen"
 editor_cmd = "sakura -e vim"
 modkey = "Mod4"
+hyper = "Mod3"
 
 -- Standard awesome library
 require("awful")
@@ -11,6 +12,8 @@ require("naughty")
 require("teardrop")
 require("obvious.popup_run_prompt")
 require("vicious")
+require("aweswt")
+
 
 
 
@@ -21,12 +24,10 @@ beautiful.init("/home/crater2150/.config/awesome/zenburn/theme.lua")
 -- Table of layouts to cover with awful.layout.inc, order matters.
 layouts =
 {
-    awful.layout.suit.tile,
-    awful.layout.suit.tile.left,
-    awful.layout.suit.tile.bottom,
-    awful.layout.suit.tile.top,
     awful.layout.suit.fair,
     awful.layout.suit.fair.horizontal,
+    awful.layout.suit.tile,
+    awful.layout.suit.tile.bottom,
     awful.layout.suit.max,
     awful.layout.suit.max.fullscreen,
     awful.layout.suit.floating