Add vim-better-whitespace to vim bundles.
Fix HADOOP_HOME path.
Add some more ftplugin files. Add commonprivate.properties for Azkaban jobtypes.
Fix merge conflicts.
Update paths.