removed ,s (never used this) ; changed tabsize to 4 and removed expandtab