Tell gitignore about Mac OS X hidden files
Merge branch 'master' of www:/repos/git/Decoders/mosesdecoder
Updating XCode project