updated thrax
now quits on sort error, allows you to specify sort tmp dir
fix to colons in feature names regexp
updated phrasal template to new thrax parameters
updated TEST target with grammar packing, bugfixes for TEST target, bugfixes for phrasal grammars
Merge branch 'devel' of https://github.com/joshua-decoder/joshua into devel

Conflicts:
	scripts/support/grammar-packer.pl
	scripts/training/pipeline.pl