Rename neobundle-settings.vim to load_plugins.vim
Merge branch 'master' into mac