some pming stuff, not fully implemented.
Merge branch 'master' of https://github.com/GeoffColburn/hackathon

Conflicts:
	ui/views/profile.html