Ugh - another commit conflict.../fall-on-sword
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/tardis-apis

* 'master' of github.com:iPlantCollaborativeOpenSource/tardis-apis:
  Ugh - another commit conflict.../fall-on-sword