Merge branch 'master' into miramerge

Passes all regression except for the score tests, as I still have to merge
in the missing files for these tests.

Conflicts:
	.gitignore
	Makefile.am
	configure.in
	moses-chart/moses-chart.xcodeproj/project.pbxproj
	moses/src/ChartHypothesis.cpp
	moses/src/ChartTranslationOptionCollection.cpp
	moses/src/ChartTrellisPath.cpp
	moses/src/DotChart.cpp
	moses/src/LMList.h
	moses/src/LanguageModel.cpp
	moses/src/LanguageModel.h
	moses/src/LanguageModelFactory.cpp
	moses/src/LanguageModelRemote.h
	moses/src/LexicalReordering.h
	moses/src/Makefile.am
	moses/src/Manager.cpp
	moses/src/Parameter.cpp
	moses/src/RuleCubeQueue.h
	moses/src/ScoreIndexManager.cpp
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	moses/src/TargetPhrase.cpp
	moses/src/TargetPhrase.h
	moses/src/TranslationOptionCollection.cpp

1 files changed, 14 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index c36d75680..0b9d41416 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@
 .deps
 *.orig
 *.la
+*.Po
+*~
+CreateOnDisk/src/CreateOnDiskPt
 Makefile
 Makefile.in
 aclocal.m4
@@ -11,6 +14,11 @@ config.h
 config.log
 config.status
 configure
+kenlm/.deps/
+kenlm/.libs/
+kenlm/build_binary
+kenlm/query
+libtool
 mert/.deps/
 kenlm/build_binary
 mert/Makefile
@@ -24,11 +32,17 @@ misc/processLexicalTable
 misc/processPhraseTable
 misc/queryLexicalTable
 mira/mira
+misc/queryPhraseTable
+moses-chart/src/.deps/
+moses-chart-cmd/src/moses_chart
 moses-cmd/src/.deps/
 moses-cmd/src/Makefile
 moses-cmd/src/Makefile.in
+moses-cmd/src/checkplf
+moses-cmd/src/lmbrgrid
 moses-cmd/src/moses
 moses/src/.deps/
+moses/src/.libs/
 moses/src/Makefile
 moses/src/Makefile.in
 scripts/training/cmert-0.5/mert