Merge pull request #1 from thinkdrop/stage

Stage
Merge branch 'dev' of github.com:thinkdrop/engage2 into dev
Merge branch 'dev' of svn-3224.prod.hosting.acquia.com:engageny2 into dev
Merge branch 'dev' of svn-3224.prod.hosting.acquia.com:engageny2 into dev
Merge branch 'dev' of svn-3224.prod.hosting.acquia.com:engageny2 into dev
Merge branch 'dev' into dev-jon
copying engage2 profile over from my branch
Merge branch 'dev' of svn-3224.prod.hosting.acquia.com:engageny2 into dev
moving contrib modules to sites/all/contrib
removing modules from appnovation profile. it is causing duplicate function warnings
Why do we need diff?
Merge branch 'dev-install-profile' of svn-3224.prod.hosting.acquia.com:engageny2 into dev-install-profile
switching theme.
Removing adaptive theme hack, since they aren't using adaptive theme.
WIP
Merge branch 'dev' into dev-install-profile
Adding redirect module.
Merge branch 'dev-install-profile' of svn-3224.prod.hosting.acquia.com:engageny2 into dev-install-profile
Merge branch 'dev' of svn-3224.prod.hosting.acquia.com:engageny2 into dev
Merge branch 'dev' of svn-3224.prod.hosting.acquia.com:engageny2 into dev