Revert "fix make flags"

This reverts commit 24d1bd7dc95d1ceff79e7038228d74fa96663f38.
Revert "try ext4+aufs"

This reverts commit 31838361d3a30ff789a4e6fb21d3a729c8f38abb.
Revert "slightly more btrfs"

This reverts commit 94cc1d5aa07d30bdca6de6241ce4d64ed892cc0c.