Milestones/2.0.0

I just need Travis, my MySQL instance fails a lot (but not because of the changes, just because I think I messed up my MySQL instance when I brew installed MariaDB despite unlinking/relinking/etc).