Working on the site from the t61p. Guess there go my modifcation times
again.
Guess I don't really need _site/ to be tracked.
Merge branch 'master' of github.com:qpfiffer/qpfiffer.com

Conflicts:
	_site/archive
	_site/pages/index.html
	_site/wiki/books
	_site/wiki/boxing
	_site/wiki/low_power_server
	_site/wiki/main
	_site/wiki/musings
	_site/wiki/people
	_site/wiki/potato
	_site/wiki/power
	_site/wiki/razor
	_site/wiki/tech