Merge pull request #375 from wardi/master

simpler+cleaner travis config, remove disabled delete-organizations command
include ati_email in transitional_orgs
custom org edit form to disable editing of most fields for now