Fix some install rules issues
Fix docs.
Update .gitignore on this branch.
Resolve some conflicts