Added labels to Axes
Fixed bug with time not being displayed in canvas js
Merge remote-tracking branch 'origin/performance-testing-v2' into v2.0-change-bootstrap
Refactor loader insertion (goodbye regex madness!). Also initial pass at allowing js response instead of just jsonp.
Add jsonp/js as an option in the testing interface. Also cleaning up jazzcat.js a bit
Fixing regression for capturing with native scripts
2 bugs fixed:

1. Only persists data to localstorage after onload.
2. Fix bug that would not store anything into localstorage if jsonp response was too big
Use minified mobify.js library
Only create scriptSplitRe once.
Adding a few more scripts to test, and adding ability to deploy performance folder to CDN
Merge branch 'v2.0' into v2.0-jazzcat-improvements

Conflicts:
	build/mobify-2.0.0alpha4.min.js
Some refactoring on httpCache, fixes tests
Fixes tests, removes junk from Makefile, upgrade grunt-saucelabs
Some fixes, adding and fixing a bunch of tests
Refactor `optimize`
Fix comment
Gets a test passing on IE10
Fix performance tests, add option to toggle concatenation
Merge branch 'v2.0-change-bootstrap' into v2.0-jazzcat-improvements

Conflicts:
	build/mobify-2.0.0alpha4.min.js
Remove references to main.js files
Merge pull request #184 from mobify/remove-main-references

Remove references to main.js files