Move JSHint config to .jshintrc file
Fix a few undefined vars
Move replaceParent funtion
Fix merge