stripe cleanup
Merge branch 'master' of https://github.com/walkerart/garden

Conflicts:
	source/layouts/layout.erb