Users are no longer incompetent

Fixes #91
Merge branch 'death-march' of github.com:bipy/pyqi into death-march

Conflicts:
	pyqi/qiime_backports/bin/qiime-server
Removed pyqi_make_script

Fixes #88, #89
I HAVE FIXED setup.py!!!

Fixes #85
Merge pull request #92 from jrrideout/death-march

Death march