Added aliases to sync feature branches and master with upstream

These would need to be tweaked to your workflow.