Wave 0.4 rc6

Please review the changes for the RC6 release candidate. 
In order to release we need ensure that all files have the license header (besides those that can't like the eclipse-formatter.xml which gets corrupted by header).
Also, we must ensure that we follow the Apache licensing guidelines - http://www.apache.org/dev/licensing-howto.html
?

Perhaps we should also work out when this should be bumped? Does it make sense for 0.4-rc6 to be version 0.6, or should it still be 0.4?
How about 0.4.6?