Merge branch 'develop' of github.com:ucb-ist-drupal/ucberkeley_cas-7 into develop
Add this will not work for CAS users to the request password link
add patch https://drupal.org/files/1850918-fix-password-asking.patc
Merge branch 'openucb-254-CB04' Password ask patch
OPENUCB-254 CB05: Link user to information about ucberkeley_envconf
Prepare for 7.x-2.0-alpha4 release
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
Add faq/troubleshooting to README
REAME: explain the Overlay situation
Readme: Add download link. Improve install instructions
OPENUCB-254 CB06: Improve post-install messages
Readme: Fix downloading links
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 the overlay problem with drupal_set_message
Prepare 2.0-alpha5 release
Fix merge conflict on version