Worked more on energy budget
#2: fixed a few UI bugs, implemented klingon AI
Merge remote-tracking branch 'origin/master' into gh-pages