node-confict working
added command line options for config
reverting gulpfile, about to setup loading
merged