Merge branch 'features/postgresql' into develop

- add spack cd command.
- Fix bug in modules hook

Conflicts:
	lib/spack/spack/cmd/stage.py
	lib/spack/spack/hooks/dotkit.py
	share/spack/setup-env.bash

share/spack/csh/spack.csh

@@ -45,6 +45,10 @@ set _sp_spec=""
 # Figure out what type of module we're running here.
 set _sp_modtype = ""
 switch ($_sp_subcommand)
+case "cd":
+    shift _sp_args
+    cd `spack stage --print-build-dir $_sp_args`
+    breaksw
 case use:
 case unuse:
 case load:

share/spack/setup-env.sh

@@ -75,6 +75,10 @@ function spack {
     # Filter out use and unuse.  For any other commands, just run the
     # command.
     case $_sp_subcommand in
+        "cd")
+            cd $(spack stage --print-build-dir "$@")
+            return
+            ;;
         "use"|"unuse"|"load"|"unload")
             # Shift any other args for use off before parsing spec.
             _sp_module_args=""
@@ -108,6 +112,7 @@ function spack {
             ;;
         *)
             command spack $_sp_flags $_sp_subcommand $_sp_spec
+            ;;
     esac
 }