fix speling misteak
Added ability to CSP solve two hierarchies
better verbosity
auto-select first possible configuration when multiple configurations are possible
Adds test for manual upload (i.e. HITL)

Adds test_manual_data_upload - tests supper for upload of data by an operator using the DirectCoverageAccess utility.  Geared towards upload of HITL QC flags.
Merge pull request #1112 from blazetopher/manual_upload

Adds test for manual upload (i.e. HITL)
Merge pull request #1111 from ifreecarve/2013-05-21_deployment_csp

Re-request of deployment activation changes, tests now passing
Bump ion-def to include elastic search boostrap change
switch instrument site from R2DEMO to PRELOAD so it's included in test
Merge pull request #1114 from ifreecarve/2013-05-22_preload

switch instrument site from R2DEMO to PRELOAD so it's included in test
Special Handlers for PyDAP Requests
Adds caching and profiling support to PyDAP
Fills in display_name for QC parameters
Updates submodules
Fixes tests
Merge pull request #1115 from lukecampbell/array-support

Additional PyDAP support
Adds support for dynamically created CC parameters

Conflicts:
	ion/services/dm/utility/test/parameter_helper.py
Don't drop the CC
Skip test leaving queues in rabbit.
removes gevent.sleep