Remove and reorganize a bunch of stuff
Correct url
Merge branch 'gh-pages' into clean

Conflicts:
	brand.html
Merge pull request #2 from denimandsteel/clean

Reorganize and get ready for move