Updated various SI/TI stuff
Delete console.log() lines
Merge branch 'master' into gh-pages