The Great Merge

- jugglypuff
- ContinuousGenerator
- BaseSite
- joshterrell.com

(rebase me)