Push all the code
Fix conflicts from github gitignore generation.