adding investigation type to PrepTemplate.create and the investigation setter
pull upstream master
adding ebi changes and investigation type changes
addressing initial comments from @adamrp
addressing @ElDeveloper's comments
fixing travis error with qiita_db/test/commands.py
fixing new error
addressing last comments from @adamrp
addressing @josenavas comments
Merge pull request #564 from antgonza/investigation_type_and_ebi_per_preprocessed

BLOCKER: Investigation type and ebi per preprocessed
merge upstream/master