Moving all the changes for porting the theme to drupal 7 into this branch in order to do all of my work in one repo