Merge branch 'master' of github.com:jchristianhall/vigor into settings-tab

Merging with master
Changed a set of options for reminders
Merge branch 'settings-tab'

Merging settings tab into master...again....