Merge branch 'dev' into whitespace-dev

Conflicts:
	chat/templates/chat/chatmessage_list.html
Merge branch 'dev' into whitespace-dev
Merge branch 'style' into whitespace-dev

Conflicts:
	chat/templates/chat/chatmessage_list.html
Merge branch 'dev' into whitespace-dev
Merge branch 'whitespace' into whitespace-dev
Merge branch 'whitespace' into whitespace-dev
wholesale robbery of pagination fragment from work (don't tell Jeff)
whitespace
Stats on user profile
Updated TODO
Merge branch 'pagination' into dev

Conflicts:
	chat/templates/chat/chatmessage_list.html
Merge branch 'dev' into whitespace-dev
Merge branch 'permalinks' into dev
Merge branch 'whitespace' into whitespace-dev
Merge branch 'dev' into whitespace-dev

Conflicts:
	chat/templates/auth/user_detail.html