More teamcity tweaks
Made teamcity keyword optional on build