Updated versions of drupal core and openatrium.
Fixed option git_branch.
Fixing make files.