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

test1 merge to master from develop
Test direct commit to master
Resolve conflict with trivial commits from previous tests
OPENUCB-217: Update makefile for features-7.x-2.0 and features_override-7.x-2.0-rc1
Reset ucb_openberkeley readme to remove trivial commits during testing
OPENUCB-217: Commit updates built from makefile: features-7.x-2.0 and features_override-7.x-2.0-rc1
Merge pull request #8 from ucbklu/openucb-217

OPENUCB-217: Update features-7.x-2.0 and add features_override-7.x-2.0-rc1
Merge pull request #9 from ucb-ist-drupal/master

Pulling OPENUCB-217 update from master to develop