Remove flymake
Straighten out package definitions