Merge pull request #24 from ucb-ist-drupal/develop

openucb-355 remove ucberkeley_cas.make
OPENUCB-106: Prevent activation emails. Cleanup feature. Make rebuild.sh parse version and create tarball
Prepare for 7.x-2.1-beta4 release
Merge pull request #26 from bwood/openucb-106-2

OPENUCB-106, OPENUCB-473