simplified: pluginsjs are manual in js now
load bootstrap tooltip.js first since popover complains.
merge issues... fixed
Merge branch 'master' of https://github.com/that0n3guy/gulpfile-laravel

Conflicts:
	Gulpfile.js