Added aliases for git merges (master\develop)
Added aliases for git merges (master\develop)

I merge frequently enough between master and develop that adding aliases
makes sense.  For both versions I am passing the --ff-only switch to
ensure a safe, clean merge.  Anything else should require typing out a
full merge command to get specifically what is needed.

brennanfee/dotfiles,brennanfee/dotfiles,brennanfee/dotfiles