Getting ready for High Charts.
Merge branch 'master' of github.com:amandabee/cunyjdata
basic tidying
SFPP charts in progress