added vim modeline, cleaned up some other stuff