Automated commit at 2013-07-01 18:31:53 UTC by middleman-deploy 3.1.2
Merge branch 'master' of github.com:cpence/cpence.github.com

Conflicts:
	products/index.html
	sitemap.xml
Automated commit at 2013-07-01 18:43:48 UTC by middleman-deploy 3.1.2