updated files with latest from master
Merge branch 'gh-pages' of github.com:wsjdesign/intentionjs into gh-pages