Remote commit; minor changes
Merge branch 'master' of https://github.com/ashwinsrnth/thrust2DIncompressible

Conflicts:
	solvers/Thrust2DIncompressibleSolver/Thrust2DIncompressibleSolver.cu