removing old cruft
class name corrections
structure code like non-noob
Merge from latest upstream and add *.swp to .gitignore