openucb-392: have build script copy Panopoly feature files and patch them
fix whitespace errors
more whitespace fixes
fix build script; tweak test
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into 392
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into 392
remove unused WYSIWYG buttons from test
apply changes to WYSIWYG test
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into 392
update rebuild script; fix wysiwyg patch
add private files patch to makefile; fix wysiwyg patch
remove whitespace errors from patch; update behat template with chrome profile.
Merge pull request #70 from cboyden/392

Merging.  Looks good.
Merge branch 'develop' of github:ucb-ist-drupal/openberkeley-drops-7 into develop