Added all code to new 'shape' theme from this tutorial:

http://themeshaper.com/2012/10/22/the-themeshaper-wordpress-theme-tutorial-2nd-edition/