Merge pull request #1 from bwood/openberkeley-105

Openberkeley 105
Merge pull request #3 from bwood/openberkeley-105

Openberkeley 105
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 pull request #6 from bwood/master

OPENUCB-254 CB04
Merge branch 'develop' of github.com:ucb-ist-drupal/ucberkeley_cas-7 into develop
Merge branch 'develop' of github.com:ucb-ist-drupal/ucberkeley_cas-7
Merge pull request #7 from bwood/master

Prepare for 2.0-alpha4 release
Merge pull request #8 from ucb-ist-drupal/master

Prepare for 2.0-alpha4 release on master
Merge branch 'develop' of github.com:ucb-ist-drupal/ucberkeley_cas-7 into develop
Prepare for further development
Merge pull request #10 from bwood/master

Improve user instructions
Merge pull request #11 from ucb-ist-drupal/develop

Merge user instructions improvements and a bunch of commits that should've been merged for the alpha4 release
Fix merge conflict on version