Merge pull request #7 from bd-j/master

Fixing Python 2 compat string formatting
Adding agb_dust parameter and change velocity_broadening to vel or wave smoothing