Fixed missing color definion
Merge pull request #1554 from trustable-code/devel

Fixed missing color definion
added 'nim*Setjmp' conditional symbols
Update cpuinfo.nim

sys/types.h needed for macosx and freebsd
sys/param.h needed for openbsd and netbsd
Raise exception on adding a non-existent file to a zip archive
Code more cleaner
Merge pull request #1559 from lorxu/devel

Update cpuinfo.nim to compile in bsd and macosx
fixes #1551
minor cleanup for cpuinfo
documentation updates
backported .deprecated statement
added missing nimfix files
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
fixes recent regression
zipfile generation works again
Merge pull request #1564 from trustable-code/devel

Raise exception on adding a non-existent file to a zip archive
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
updated news.txt slightly
Merge branch 'devel' into bigbreak

Conflicts:
	compiler/ast.nim
	compiler/nimfix/prettybase.nim
	compiler/pragmas.nim
	compiler/sempass2.nim
	doc/manual.txt
	koch.nim
	lib/pure/concurrency/threadpool.nim
	web/news.txt