trying to work on the charting stuff
we now have calendar dates working along with last N points and using epoch offsets and this is all separate from the URL know such that
we can use the new framework which is separate from dates and such as well
Merge branch 'chartdates' into devbranch-dhiller

Conflicts:
	webapp/app/controllers/gui/util/ChartUtil.java
Merge branch 'devbranch-dhiller' of github.com:deanhiller/databus into devbranch-dhiller
fix the flot chart now as well
fix the application.conf file