Merge branch 'hotfix-serial-plugin' into develop

Conflicts:
	.travis.yml
	README.md
	mc/VMMaker-oscog.package/monticello.meta/version
Merge branch 'upstream-master' into upstream-develop

Conflicts:
	codegen-scripts/extract-commit-info.sh
Delete README.cog

outdated
more gitignores

(cherry picked from commit f689dc6beac645b9d568074e18362d15ff204ffa)
added tons of git ignores

(cherry picked from commit 1eb99b8c8b211e9cfa13ca8c624ca90ff89ca2e8)

Conflicts:
	.gitignore
fixing conflict