Merge branch 'master' of git.epichack.com:barak/dotfiles

.config/awesome/rc.lua

@@ -156,7 +156,6 @@ function (widget, args)
         return args[2]
 end , 120, "BAT0")
 
-
 -- Register CPU widget
 vicious.register(cpuwidget, vicious.widgets.cpu, 
                     function (widget, args)

.config/fish/config.fish

@@ -1,4 +1,5 @@
 set PATH ~/bin /bin /sbin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin ~/.cabal/bin /usr/lib/go/bin ~/.gem/ruby/1.9.1/bin $PATH
 
 set fish_greeting ""
+
 . ~/.bash_aliases