fix branch
Merge https://github.com/nathanalexander/pyrocms

Conflicts:
	.DS_Store