Made a faster version of the R code
Merge branch 'master' of https://github.com/gageholden/Pyam

Conflicts:
	pyam_0_1/pyamR.R
Lots of modifications to the R script; bit haywire atm but it works