update .gitignores
update bootstrap and move system includes
minor changes to comments