Merge branch 'elevation2' of https://github.com/adamrp/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'fix_study_summary' of https://github.com/adamrp/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'fixconsentformat' of https://github.com/teravest/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Merge branch 'master' of git://github.com/qiime/qiime_web_app
Fix formatting and add ascp password env variable

There were a few problems with the new configuration that we got after
contacting EBI, in short:
    - Passwords had to be updated, so we've centralized the retrieval of
      the credentials to be only in this file for the subprocesses that
      need them.
    - There was a missin `"` in the formatting of a string to generate
      the CURL commands.
copied map marker code from american gut
removing extra whitespace
final fix up
fix icons
Merge pull request #640 from teravest/mapmarkers

Fix map markers on qiime and emp