Updated a number of files to get this version of my app to work with newer rails conventions