Cleaned out all the console.logs
Merge branch 'develop' into postgres