Added browser-sync module to package.json and modified gruntfile to run with both livereload and BS
Fixed syntax errors in gruntfile
Merge branch 'master' into browser-sync

Conflicts:
	app/templates/Gruntfile.js
	app/templates/_package.json
Final updates to browser-sync module and bug fixed Fixes #31