tired of typing bundle exe...
setup auto merge and rebase, as per Russells suggestion
added easy commenting