sketched out architecture for models, views, and collections and for basic templating
merged master into amy