Merge pull request #68 from keymon/PR59-fixes

Brief smoke test was successful.
Merge pull request #66 from ripienaar/PR59

Clean merge for PR#59 'Expanded includes'
bump graphite-graph-dsl version
URL parameter Placeholders in graph definitions
Merge pull request #72 from ripienaar/placeholders

URL parameter placeholders in graph definitions
Fixed #62 which was broken
Merge branch 'master' into pretty_print

Conflicts:
	README.md
	lib/gdash/sinatra_app.rb