merging
Merge branch 'master' of https://github.com/bwallace/OpenMeta-analyst-

Conflicts:
	R/src/binary_methods.r
Merge branch 'master' of https://github.com/bwallace/OpenMeta-analyst-
merging...
Merge branch 'master' of https://github.com/bwallace/OpenMeta-analyst-
small fix for issue with opening datasets sans state file