Tidied, added IDs
Merge branch 'master' of github.com:amandabee/cunyjdata