Cleaned up file detection
Added puppet and syntastic modules to vim
Merge remote-tracking branch 'upstream/master'
merging local with Trevors