Switched karma over to alias system.
Merge branch 'master' into useralias