consolidated AlarmViewController category

somehow didn’t catch this earlier (must have been a make cache)—
combined the two AVC categories (thanks
https://twitter.com/xsahoodev/status/464050286554652672), minor
refactoring to play nice with environment