Fix for #15. Also tons of whitespace cleanup.
Resolve merge conflict

Merge branch 'dev' of https://github.com/LCHansson/rSCB into dev

Conflicts:
	R/getData.R