Adds conda recipe dist/conda/
Merge branch 'deployment/v2.1' into 'master'
Merge pull request 20 from NSLS-II
Removes looping and machine changes from 1.0.3 schema

They should only be on schema 1.0.4

db/versions/v1_0_3/specs/all.xml:
* Machine object moved back to log object
* Removed LOOP_ITERATION

db/versions/v1_0_3/domain/auto_gen.py
db/versions/v1_0_3/persistence/sql/auto_gen.py
db/versions/v1_0_3/persistence/xml/auto_gen.py
db/versions/v1_0_3/schemas/sql/vistrails.sql
db/versions/v1_0_3/schemas/sql/vistrails_drop.sql
db/versions/v1_0_3/schemas/xml/log.xsd

Ticket: 894
update_connections: do not run mark_list_depth on invalid pipeline

This was triggered by the upgrade code

gui/pipeline_view.py:
 - update_connections:
   Check if valid before calling mark_list_depth
Fixed typo in remap_module

core/upgradeworkflow.py:
 - remap_module:
   module_desc.spec_tuple() -> module_desc.spec_tuple
Added missing Results port upgrade for Map and Filter

They are now of type List but upgrade only existed for Map on master

Bugfix: Map and Filter upgrades were missing
Merge branch 'v2.1'

Conflicts:
	vistrails/packages/controlflow/init.py
Merge remote-tracking branch 'vistrails/master'
Fixed update_connections using wrong pipeline attribute
Added DBLoopIteration upgrade path

db/versions/v1_0_4/translate/v1_0_3.py:
  Convert LoopExecs to LoopIterations and put them in a single LoopExec

Ticket: 817
Merge remote-tracking branch 'vistrails/master'