Upgrade for Rails to 3.0.19 see TDLR-420
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'

Conflicts:
	Gemfile
holdover from when we went live that should've been committed, its the rotation for hte production log
robots.txt changes we made last week
Merge remote-tracking branch 'origin/master'
pdf pages path was wrong for stage
database was wrong for stage
Merge remote-tracking branch 'origin/master'
having certain handlers enabled/disabled between environments like luke and admin are pushing me towards maintaining environment specific configs.
Merge remote-tracking branch 'origin/master' into develop