Update tribler_experiment_setup.sh
Reducing sum_total_records and sum_statistics and using those files when
generating graphs
No more opts used by r graphs
Conflicts:
	scripts/r/statistics.r
Removed dependency on qplot reshape2 and some other obscure r packages.
Showing nodename while parsing resourcefile
Peertype fix
Conflicts:
	experiments/dispersy/extract_dispersy_statistics.py
Merge bug
Merge fix
Merge pull request #71 from NielsZeilemaker/merge_branch

Merge back improvements from PrivateSocial
Merge branch 'master' of ssh://git@github.com/Tribler/gumby.git into pdf

Conflicts:
	gumby/experiments/dispersyclient.py