Boxfile for writable dir
Merge branch 'master' of git.pagodabox.com:circulate

Conflicts:
	Boxfile
Merge branch 'master' of git.pagodabox.com:circulate

Conflicts:
	Boxfile
Merge branch 'master' of git.pagodabox.com:circulate

Conflicts:
	Boxfile