Tidy up/correct build script a bit.

Fix incorrect plugin names.

Move task configuration into the task, rather than referencing it
oddly afterwards.
Merge pull request #162 from csmith/master

Tidy up/correct build script a bit.