total code cleanup
Merge branch 'master' of https://github.com/bepec/deVega
Merging