Extract if(dpms) calls to wrapper functions
Extract start/stop timer code to reusable funcs
Replace '1' with "EXIT_FAILURE"
Merge branch 'master' of git://code.i3wm.org/i3lock

Conflicts:
	i3lock.c
	unlock_indicator.c
	unlock_indicator.h