inputrc comment tweak
added merge.defaultToUpstream to config
added jshint bundle