Merge branch 'master' into vm2

Conflicts:
	compiler/sem.nim

compiler/nimrod.nimrod.cfg

@@ -0,0 +1,17 @@
+# Special configuration file for the Nimrod project
+
+mainModule:"nimrod.nim"
+
+# gc:markAndSweep
+
+hint[XDeclaredButNotUsed]:off
+path:"llvm"
+path:"$projectPath/.."
+
+path:"$lib/packages/docutils"
+
+define:booting
+
+@if windows:
+  cincludes: "$lib/wrappers/libffi/common"
+@end