Adding fasd to zshrc so it can start to learn.
Adding heroku to list of origin when creating repo.
Ignoring missing src onn images.
Updating grunt, bower and npm aliases.
Adding vrpsh alias to push to heroku.
Removing fasd init.
Adding git alias for listing conflicts.
Updating submodule.
Updating submodule.
Updating git aliases to better pull/merge/squash.
Allow zsh completion of vbs/git merge-squash.
Merge branch 'develop'
Update push indicator on merge.