config updates
Merge branch 'master' of https://github.com/beachian/beachian.github.com

Conflicts:
	_posts/2013-06-04-portfolio-item-1.md