File types are now properly enabled.

This is part of the Vundle documentation that was missed.  Now, filetype
plugins should work correctly.
Cleanup and changed a mapping.

<C-p> was replaced with <leader>f for consistency.
Merge branch 'master' of github.com:sybrandy/local_config