Made changes to ensure scripts ran and changed file directories slightly
Merge branch 'rstudio' of https://github.com/sd2k/square into rstudio

Conflicts:
	square_rproj/src/process_opigram.R