Fixed issue with findViewByID NPEs and issue with alarm screen still
visible if alarm killed elsewhere
shorten phone controls delay
Merge branch 'tidy-up' (hairy merge, I think it worked)

* tidy-up:
  Fixed issue with findViewByID NPEs and issue with alarm screen still visible if alarm killed elsewhere

Conflicts:
	src/org/durka/hallmonitor/DefaultActivity.java