Reverted to upstreams Makefile and .pro file for smoother pull request