Fixed a few merge issues and added install section to README