Cleaned up build system
Updated README