Refactor js into new file, Change graphs for dual-year layout
Small changes to example JSON to make easier to parse