Use most recent make includes
Fix PEP8 issues