Added apache to test integration with adagios, seems to work with dygraphs in adagios now
Code cleanup