limit initial reservation time to 2 hours for non-donators
non-donators extend reservations 20 minutes at a time
dont show nag message to donators
dont show nag message to donators
Merge branch 'master' into donators
Merge branch 'master' into donators

Conflicts:
	app/views/shared/_nag_message.html.haml
Merge branch 'master' into donators
enable threadsafe, use donators branch for na and add capistrano-puma
Merge branch 'donators'