Feature/add combine by hour

Added some code to the rake task and punch model to allow for combination of punches by hour.  This is useful on my site where it is heavily trafficked.