switch dictionary out of testing to merge with master
fixed spacing issues arising from .vimrc