merging in recent changes from Curt's system
staging changes before merge between Curt's internal branch and the master on github
Merge /Users/clisle/Projects/xdata/code/github/xdata-apps/twitter-mention-history

hand resolved conflicts

Conflicts:
	twitter.js
slight UI improvements;  better text explanation on history.  change history control panel to have "close" button