change defaults in directives
add a 2d to 3d map and test it!
Merge branch 'master' of https://github.com/simpeg/simpeg