pyramid alignment
Merge branch 'master' of https://github.com/sciencewiz1/maslab-staff-2013

Conflicts:
	states.py

merge attempt