Header title and subtitle from config. If not set, fall back to theme defaults.
font awesome 3.2.1, new nav links/icons - bitbucket, flickr
Merge pull request #24 from zalew/master

Header title and subtitle from config, font-awesome 3.2.1, bitbucket and flickr icons/links for nav
Fix issue with category links when a category contains a '.'.
Merge branch 'master' of https://github.com/alexgaribay/octoflat into upgrade

Conflicts:
	source/_includes/custom/header.html
	source/_includes/post/categories.html