 
 	formatTime: ( date ) ->
 		hours = date.getHours()
-		suffix = 'AM'
-		if hours >= 12
-			suffix = 'PM'
-			hours -= 12
-		if hours == 0
-			hours = 12
+		military = '24hr' == window.rohStore.get 'clock format'
+		unless military
+			suffix = 'AM'
+			if hours >= 12
+				suffix = 'PM'
+				hours -= 12
+			if hours == 0
+				hours = 12
 		minutes = date.getMinutes()
 		if hours < 10
 			hours = ' ' + hours
 		if minutes < 10
 			minutes = '0' + minutes
-
-		return "#{hours}:#{minutes} #{suffix}"
+		if military
+			return "#{hours}:#{minutes}"
+		else
+			return "#{hours}:#{minutes} #{suffix}"
 
 	linkify: (text) ->
 		# Put spaces infront of <s to stop urlize seizing them as urls

					@statusMessage 'Invalid Regex: ' + res
				else
					@statusMessage 'Notification regex saved!'
		else
			return false
		return true

		else if ! command.indexOf 'logout'
			loginMgr.logout()
		else if ! command.indexOf 'password'
			pass = text.substr 10
			if ! pass.length
				loginMgr.forgetPassword()
				@statusMessage 'Password removed.'
