Removed old filetype functionality
Added new plugin functionality
Merge branch 'filetype'

* filetype:
  Added new plugin functionality
  Removed old filetype functionality