Removing reference to noexistent war.dir property
Merging resolve and retrieve tasks
Adding compile vs test scope and declaring servlet-api in test scope.

Fixes #518.