Version bump (3.0.4)
Add 2-clause BSD license for spec file
Merge branch '3.0-maint' into 3.1-maint

Conflicts:
	euca2ools.spec