Merge pull request #1 from ewdurbin/master

fixups for graphite-web