Merge pull request #1 from russbt/master

Corrected usage of '@' for define vs case
Pylint fixes
Add .vp as a format
Merge fixes