Added laptop .emacs to global .emacs
Changed icons to relatve paths in conkyrc
Changed xmonad for small laptop screen
Fixed trayer on laptop
Added more icons
Merge branch 'master' into laptop
Localized conky for laptop
Added laptop power and wifi info to the status bar
Removed network info from dzen

This isn't necessary since we have nm-applet and trayer
Merge branch 'master' into laptop

Conflicts:
	.conkyrc
Returned dzen font size to 12
Merge branch 'master' into laptop

Conflicts:
	.conkyrc
Fixed AC icon on laptop in conky
Fixed Volume icon in conky
Remove battery_short from conky

I trust the battery icon enough that I no longer need battery_short
Merge branch 'master' into laptop

Conflicts:
	.conkyrc
Merge branch 'master' into laptop
Merge branch 'master' into laptop

Conflicts:
	.conkyrc
	.emacs
Modify path to include maple
Merge branch 'master' into laptop

Conflicts:
	.xinitrc
	xmonad.hs