Fixed history section

Upgraded the twitter api to 1.1
Merge branch 'master' of https://github.com/rayploski/twitterwall

* 'master' of https://github.com/rayploski/twitterwall:
  Added picture instead of Javascript to display the map.  It is
cleaner this way

Conflicts:
	history/data/search1.json