Cleaned up plovr build + provide/require issues