initial refactor
Merge branch 'arch-refactor' of github.com:rhanak/merwar into arch-refactor

Conflicts:
	pages.py
refactoring is going well
fixing bugs after moving stuff around