Obama’s security plan emphasizes diplomacy, aid, but doesn’t disavow pre-emptive strike policy