Adding in readme
fixing json to point at the right place
merging dev
removing some files
a refactor to help sort out stuff