Removed .settings from .gitignore - @jpountz intended

for it to be included to ensure consistent code styles
between eclipse and IDEA. Instead just ignore
the org.eclipse.m2e preferences

.gitignore

@@ -22,7 +22,7 @@ eclipse-build
 */.project
 */.classpath
 */eclipse-build
-.settings/
+/.settings/org.eclipse.m2e.*
 
 ## netbeans ignores
 nb-configuration.xml