minor changes to default paths
updated clang-format

clang-format version 3.6.0 (git@github.com:llvm-mirror/clang.git 5ce1cbcffd7625935379d405d76af576bfec0d8d) (git@github.com:llvm-mirror/llvm.git baaa29f3a2b5b4463921fe3af7669850e7de81fd)