add hadoop settings; use default java
set default expandtab width=2; add changesqlcase
fix conflicts