changes the calendar events to only pull every hour but have the tweets still pull every minute.
Merge branch 'hotfix/0.1.4' into develop

Conflicts:
	app/assets/javascripts/application.js