Summary of commit

* Remove return from task functions
* Shrunk www-* tasks to just www