starting to add the facebook and twitter metadata to my site.
resolved conflict and pulled in changes from origin.
added a few new config options, added a new font, and added some metadata.