Updated travis badge to agov
Restructured phing build config
Clean up file permissions
Cleanup build file
Merge branch 'master' into 2.x

Conflicts:
	README.md