Changed to reflect new bindings
Fixed git flow alias and changed editor to Atom
Merge branch 'feature/vim-zsh-bindings' into develop

* feature/vim-zsh-bindings:
  Fixed git flow alias and changed editor to Atom
  Changed to reflect new bindings