Cleaned up a lot of the files for the coding style specified at https://github.com/sdepold/sequelize#6-some-words-about-coding-style
merge