Added filetype on if/when possible
Merge branch 'master' of github.com:calebsmith/vimrc
Rearranged blocks and added comments to each section
Added a makefile to simplify copying of files to the user's directory