Site update at Sat Apr  5 13:00:30 2014
No idea wtf git is trying to do here.

Merge branch 'master' of github.com:pwarren/pwarren.github.io

Conflicts:
	categories/coffee/index.html
	categories/family/index.html
	categories/recipes/index.html
	categories/talks/index.html
	categories/tech/index.html
	coffee/2014/02/04/roasting-setup.html
	coffee/index.html
	family/2013/05/21/Random-Notes.html
	family/2013/05/21/Stories-from-Ellen.html
	family/index.html
	feed.xml
	index.html
	page2/index.html
	page3/index.html
	personal/index.html
	recipes/2013/05/19/tomato-sauce.html
	recipes/2013/05/20/plum-sauce.html
	recipes/index.html
	sitemap.xml
	talks/2014/01/27/rtl-entropy.html
	talks/index.html
	tech/2013/10/21/firefox-i386-on-debian-amd64.html
	tech/2013/12/17/EFI-single-boot-mac.html
	tech/2014/02/02/Ardusat-contact-attempt1.html
	tech/2014/02/11/APRS-to-YAAC.html
	tech/2014/02/17/gnuradio-git-debian.html
	tech/2014/02/26/Satellite-Recieved.html
	tech/2014/04/04/vk1paw.html
	tech/index.html
Site update at Sat Apr  5 13:02:51 2014