Merge pull request #4 from bwood/master

Merge openucb-105 work
Merge branch 'develop' because I need the most recent README to show up in the master branch
Merge branch 'develop' of github.com:ucb-ist-drupal/ucberkeley_cas-7
Merge pull request #8 from ucb-ist-drupal/master

Prepare for 2.0-alpha4 release on master