lotsa updates
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
Merge branch 'master' of git://github.com/qiime/qiime_web_app into agut
stuff to support international zip codes
correct version of add_sample
more rollback
Merge pull request #324 from douginator2000/zip

Zip code updates