Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Build cleanup
PM: enable browserstack 'live' crossbrowser testing through grunt
PM: split lightbox notes up for ajax boxes
Merge branch 'master' of https://github.com/skyglobal/web-toolkit
ST: Video player bug, missing video team js and css files.
ST: Video player bug, added omniture JS. HtmlPlayer was complaining about needing said file.
add notes around the use of skycons

Resolves #121
Merge pull request #123 from skycom/master

ST: Video player bug fix (found by Peter) Resolves #122
clean and separate grunt file
fix grunt aliases
add grunt timings as a way on keeping tabs on build time.
introduce `grunt server` and remove the need to run `jekyll serve`
added separate toolkit.min.js file
added release date + version number to both toolkit js files
correctly set new toolkit.min.js uglify config
Merge from upstream