Updated to drupal 7.20. Basically just committing everything as-is before getting back to work after
a 4 month break.
Merge remote branch 'origin/master'