Fixed broken dependencies, and did general boilerplate cleanup
Merge and cleanup
Fixed README