added ctags, some seemingly random formats in prefs
Merge remote-tracking branch 'origin/master'