Fixing unit tests
Cleaning up conflicts
Cosmetics
Minor improvements
Small improvements
Adding documentation
Now all site.vm point to the master one, Twitte...
Removing site.vm exact copies