Fix merge and add livereload and other grunt options