add settings for cocos2d-x
update bundles.
Merge branch 'master' of github.com:popkirby/dotfiles