This is 2.0 now
Closes #154
Leftover from e1579e69404bb67cc6f120affdbbfb5fdb3d9051
Prepare release
Remove trailing comma
Closes #156
Leftover from 85a760040804ba580f23c2636f82aa8265c6a2b8
Merge branch '2.0'