merge oauth branch into dev
fix capistrano scripts
added dataone logo image
remove file
remove hgignore file
Merge branch 'oauth' into development
Merge branch 'oauth' into development
change hosts in shibboleth.yml
fix double filename when submitting same file twice
add file_already_submitted method
Merge branch 'development' into oauth
Set external_id for user to test on local env