add additional circle icon classes and colors
fix header extra spacing and cleanup whitespace
increase media query breakpoint on large screens
lots of style updates/fixes for spacing, fonts, etc.
update bootstrap to 3.1.1 (1/2)
update bootstrap to 3.1.1 (2/2)
fix things that broke in bootstrap update
fix nav scroll position
add scrollspy for projects
Merge commit '67c0b78dec8473213e9c7420ec6018c1deb827cf'

* commit '67c0b78dec8473213e9c7420ec6018c1deb827cf':
  make text color styles important

Conflicts:
	library/theme/css/bootstrap-themed.css
Merge commit 'ce05f156867ca5d66b8867d954b5cc37f2fcde7d'

* commit 'ce05f156867ca5d66b8867d954b5cc37f2fcde7d':
  add waypoints

Conflicts:
	header.php
	library/js/scripts.js
	library/theme/css/bootstrap-themed.css
add waypoints to functions.php
waypoints!