Header cleanup.
Functions cleanup for readability.
Upgrade to bootstrap 2.3.1
using get_stylesheet_uri() so that a child theme will load it's own style.css file
Merge remote-tracking branch 'kennedyr/master' into kennedyr-merge

Conflicts:
	functions.php
	header.php
	library/css/bootstrap.css

merge kennedyr's branch, including bootstrap 2.3.1