added ftdetect for usr_bin_env shebang files
added easymotion
resolved conflicts