javascript merges
stylesheet updates, and small renaming
Merge pull request #89 from anchor/right_fold

Fold Clizia back into Machiavelli proper