Stash it
Merge branch 'master' into kerr/inital-setup
Update to log, spec not working correctly.
Use Chrome instead of phantomjs, apparently phantomjs doesn't have real XHR
Works!
fix it, yo
Merge branch 'master' of https://github.com/askore/capstone2014-firefoxOS