Fix .gitignore
Merge remote-tracking branch 'origin/master' into 1092_es_mapping
Added some boost values