-Changes for natero.
Merge branch 'master' of github.com:garthgoodson/flot