config fixes and page updates
Merge branch 'master' of github.com:liezl200/liezl200.github.io

Conflicts:
	_posts/2013-04-14-Launching-Day.md
	pages/about.md