diff --git a/.gitignore b/.gitignore
index 63282cc1..94b90ab8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 AUTHORS
 ChangeLog
+*.swp
 dist/
 .tox
 *.egg-info
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..0f2ffac0
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Kun Huang <gareth@unitedstack.com> <academicgareth@gmail.com>