Merge branch 'master' of github.com:shakyShane/browser-sync