Merge branch 'master' into laptop
Merge branch 'laptop' of github.com:kdmurray91/configs into laptop
added wicd back into rc.lua
merged origin, should fix push non-ff errors
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge remote-tracking branch 'origin/master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
disabled autostart of wicd
added alias for dual-screening
added laptop's pws into aspell.pws
added HDMI suffixes to dualscreen aliases, can now control which screen to use
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop
Merge branch 'master' into laptop