Separate font settings by system-type
Set company-tooltip-flip-when-above to t
Add java-mode indentation settings
Merge remote-tracking branch 'upstream/master'