clean up
update packages, add c-style PSR2, change popwin settings