updating drupal core 7.26
updated chaos tools (there was a security update)
Merge branch 'updates_726_lm'

merging changes back into master