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

Pull from develop to master (OPENUCB-225: Fix Media module Wysiwyg integration)
Merge pull request #13 from ucb-ist-drupal/develop

OPENUCB-121: Updates to makefile, info, and remove profiles/panopoly
Fix typo and add drush 6 comment in openberkeley.make
Update google_analytics to 1.4 - see OPENUCB-231
Cleanup makefiles - build-openberkeley.make, drupal-org-core.make, drupal-org.make
Add rebuild script for running openberkeley.make
OPENUCB-121: Commit updates built from makefile: google_analytics, libraries, drush info updates
Merge pull request #14 from ucbklu/openucb-121

OPENUCB-121: Updates to makefile, info, and remove profiles/panopoly