Updated files for the 0.3.3 release.
Merge branch 'cwas' into 0.3.3_development
merge with 0.3.3_development