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

OPENUCB-247: Updating Drupal 7.26 - merge to master after verifying on develop
OPENUCB-245: Update makefile for Panopoly 1.1
OPENUCB-245: Removed from makefile: ob227 entity, ob214 entityreference, ob217 features
OPENUCB-245: Commit Panopoly 1.1 updates built from makefile
Merge pull request #17 from ucbklu/openucb-245

OPENUCB-245: Applying Panopoly 1.1 to develop branch; waiting on master branch