switched to vi as editor
Merge remote branch 'origin/master'
Removed simple push...for now...