fixed karama tests
added phantomjs karma test to run in travis
Add logarithmic scale function
Merge pull request #212 from andrewmichaelsmith/log_func

Add logarithmic scale function
Adds support to have filters inside filters, (nested templated segments), Closes #128
Fix a "kibana" leftover in comments
Merge pull request #213 from jaimegago/master

Fix a "kibana" leftover in comments
make html-unsafe for text/html panels
Merge branch 'master' of github.com:bruce-lyft/grafana