Merge pull request #21 from bwood/master

ucberkeley_cas-7.x-beta2 update
Merge pull request #22 from ucb-ist-drupal/develop

ucberkeley_cas-7.x-beta2 update
Prepare for 2.1-beta3 release
Prepare for release