Removed the unnecessary string interpolations, removed to_sql and to_sql_solumn, and updated AR scope syntax.
fixed a bug in payform model
Hugh made some changes to the punch clock timer js file.
fixed where(:id = blah) to find(blah)
fixed a few non-idiomatic finds
fixed merge issues
changed first() to first
refactored a few parts, removed string interpolation
improved AR queries
merge conflicts