tux-ninja stuff
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	awesome/rc.lua
	xinitrc-tux-ninja
fixed merge
Added some tm dns stuff
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	bin/makebindforward.sh