logged-in user profile working, uploads complete
Merge branch 'master' of git://github.com/mikesteele/tumbleweed

Conflicts:
	app.js