Merge pull request #1 from cdimartino/patch-1

Command line args need to be cast to_i
Pull all punches when doing combine first
Bumping version #
Change how we pull punches
Fixing a bug which was causing some record loss during combine phase
Adding code to allow combination of record by hour for very busy sites
Merge remote-tracking branch 'original/master' into feature/add_combine_by_hour

* original/master:
  Set Ruby version to 2.1.4
  add block to default scope
  Bump version to 0.3.9

Conflicts:
	lib/punching_bag/version.rb
Merge remote-tracking branch 'original/master' into branches/fix_losing_punches_bug

* original/master:
  Set Ruby version to 2.1.4
  add block to default scope
  Bump version to 0.3.9
Fixing indentation
Merge branch 'branches/fix_losing_punches_bug' of github.com:cdimartino/punching_bag into branches/fix_losing_punches_bug

* 'branches/fix_losing_punches_bug' of github.com:cdimartino/punching_bag:
  Set Ruby version to 2.1.4
  add block to default scope
  Bump version to 0.3.9
Merge branch 'feature/add_combine_by_hour'

* feature/add_combine_by_hour:
  Adding code to allow combination of record by hour for very busy sites