additions, changes for boxen and for not using macvim