Merge pull request #268 from wgerlach/master

various chages
Merge branch 'master' of github.com:MG-RAST/AWE