Clean up _config.yml; small bio update

The _config.yml file had some conflict info in it, presumably from when
I did the update to the most current Octopress.