Use grunt-contrib-watch for livereload

https://github.com/gruntjs/grunt-contrib-watch#live-reloading
Fix options not getting through after the the prompt rewrite
Use the global folder conf in a few more places
Switch from grunt-requirejs to grunt-contrib-requirejs

Fixes #1050
Only include grunt-bower-requirejs if RJS is chosen
Various fixes