Adding default_modules to apache to match the recipe defaults
Adding perl, php5, and python modules
Add ssl to default_modules
Update description
Include automator and provider types in the export and import
calls.
check for script instead of shell
Merge remote-tracking branch 'origin/develop' into feature/add-plugin-types-to-export-import

Conflicts:
	server/src/main/java/com/continuuity/loom/http/LoomAdminHandler.java
refactor guice modules into separate pieces so that we can
re-use them in smaller contexts.
Merge pull request #255 from continuuity/feature/guice-refactor

refactor guice modules into separate pieces so that we can
make sure scheduler isnt running on its own during unit tests.
Merge pull request #257 from continuuity/feature/fix-scheduler-test

make sure scheduler isnt running on its own during unit tests.
Merge remote-tracking branch 'origin/develop' into feature/add-plugin-types-to-export-import

Conflicts:
	server/src/main/java/com/continuuity/loom/http/handler/LoomAdminHandler.java
Merge pull request #246 from continuuity/feature/add-plugin-types-to-export-import

Include automator and provider types in the export and import
use of the zookeeper namespace conf setting was accidentally
taken out during refactoring. Putting it back in.
Merge pull request #248 from continuuity/hotfix/shell-wrapper-script-detection

check for script instead of shell
Merge pull request #260 from continuuity/feature/zk-namespace-should-be-used

use of the zookeeper namespace conf setting was accidentally
Merge pull request #238 from continuuity/feature/apache-modules-perl-php-python

Feature/apache modules perl php python
concurrent zk queue test can take a really long time on really
slow machines.  Increasing the timeout and making it sleep for
less time.
Sync krb5_utils cookbook with continuuity/krb5_utils_cookbook
Merge pull request #261 from continuuity/feature/long-zk-queue-test

concurrent zk queue test can take a really long time on really