Merge pull request #15 from apple/master

merge

Author: JacobMao

.flake8

@@ -1,5 +1,5 @@
 [flake8]
-ignore = W291
+ignore = W291 W504
 filename = *.py,
            ./utils/80+-check,
            ./utils/backtrace-check,

.gitignore

@@ -34,6 +34,9 @@ docs/_build
 # Finder metadata
 .DS_Store
 
+# Visual Studio metadata
+.vs
+
 #==============================================================================#
 # Ignore CMake temporary files
 #==============================================================================#

.mailmap

@@ -29,12 +29,11 @@ Daniel Duan <[email protected]> <[email protected]>
 Dante Broggi <[email protected]>
 Dave <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
-Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Abrahams <[email protected]> <[email protected]>
 Dave Lee <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]> <[email protected]>
-David Rönnqvist <[email protected]>
+David Rönnqvist <[email protected]> <[email protected]>
+David Rönnqvist <[email protected]>
 David Ungar <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
 David Zarzycki <[email protected]> <[email protected]>
@@ -43,10 +42,8 @@ Davide Italiano <[email protected]> <[email protected]>
 Davide Italiano <[email protected]> <[email protected]>
 Dmitri Gribenko <[email protected]> <[email protected]>
 Doug Coleman <[email protected]> <[email protected]>
-Enrico Granata <[email protected]> <[email protected]>
 Enrico Granata <[email protected]> <[email protected]>
 Erik Eckstein <[email protected]>
-Erik Eckstein <[email protected]> <[email protected]>
 Erik Verbruggen <[email protected]> <[email protected]>
 Ewa Matejska <[email protected]>
 Ewa Matejska <[email protected]> <[email protected]>
@@ -130,15 +127,13 @@ Ross Bayer <[email protected]>
 Russ Bishop <[email protected]> <[email protected]>
 Ryan Lovelett <[email protected]> <[email protected]>
 Shawn Erickson <[email protected]> <[email protected]>
-Slava Pestov <[email protected]> <[email protected]>
 Slava Pestov <[email protected]> <[email protected]>
 Stephen Canon <[email protected]>
 Stephen Canon <[email protected]> <[email protected]>
 Sukolsak Sakshuwong <[email protected]>
 Todd Fiala <[email protected]> <[email protected]>
 Toni Suter <[email protected]> <[email protected]>
 Vedant Kumar <[email protected]> <[email protected]>
-Xi Ge <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Xin Tong <[email protected]> <[email protected]>
 Yuka Ezura <[email protected]> <[email protected]>