Changed handling of wavenumber
Merge branch 'k->omega' into 2d

Conflicts:
	sfs/mono/drivingfunction.py
	sfs/mono/synthesized.py
Changed handling of secondary source type, renamed driving functions