Add a magnetic|velocity option to the power-spectrum command
Merge branch 'dynamo' of github.com:jzrake/m2 into dynamo