Fixing unit tests for pcoalabels branch
Merge branch 'master' of https://github.com/qiime/evident

Conflicts:
	www/handler.psp

Solving conflict with handler
Using one rarefaction for all processes
Added, alpha rarefaction demo files

There are two files per study in the demo list, one using the standard
deviation and the other one using the standard error to draw the error bars
in the rarefadction plots.
Removed, old alpha_rarefaction files
Changed, filename creation for the alpha files
Updated, check for all the rarefaction files
Removed, conditionals for the HMP alpha demos
These should be the last changes to use the same files for all analyses
Merge pull request #22 from antgonza/one_single_sample_selection

One single sample selection
Merge branch 'master' of git://github.com/qiime/evident into alpha_demo

Conflicts:
	www/handler.psp
Merge pull request #21 from ElDeveloper/alpha_demo

Alpha rarefaction plots (demo)
Fixing unit tests
Merge branch 'master' of https://github.com/qiime/evident
Fixing unit tests
Checking in updated loader
Merge pull request #19 from meganap/pcoalabels

Fixing unit tests for pcoalabels branch
Merge pull request #23 from meganap/fixloader

Updated loader
resolves issue #9
Merge pull request #24 from wdwvt1/issue_9

resolves issue #9