fixing build

Conflicts:
	.gitignore
Don't zip FAKE stuff
Adding Colin to the authors
Merge branch 'master' into develop