Move to the new router
Add a syslogd
My webpage should be formatted to 80 columns
Merge branch 'my-rpi' into laptop

Conflicts:
	system/boot.sh
	utils/start-env
Use underscores instead of dashes

Dahses are confusing and annoying! :(
Merge branch 'my-rpi' into laptop

Conflicts:
	config/mailcap_mutt
	config/muttrc
	system/backup_rpi.sh
	system/boot.sh
	system/start_ui.sh
	utils/set_term_colors
	utils/start_env
Merge branch 'laptop' of github.com:ypsu/desktop-configuration into laptop