Tux stuff
thinkpad stuff and some eclim stuff
stashing changes
stashing locals
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	awesome/rc.lua
	bin/set-awesome-client-icon.sh
	conky-tux.conf
	vimperatorrc
	xinitrc-tux
	xinitrc-tux-ninja
	zshenv
merged