Austin Seipp authored Feb 23, 2015 and thoughtpolice committed Feb 23, 2015

There's no reason to have two files, and this is one step towards a
cleaner root directory.

Signed-off-by: Austin Seipp <austin@well-typed.com>
(cherry picked from commit c3f9eb4d)