switch to json site format
Merge branch 'master' of github.com:phil-monroe/phil-monroe.github.com

Conflicts:
	_includes/themes/twitter/default.html