dillon changes
conflicts cleanup
added error handling to gulpfile