split up CBM: power sources into 5 CBM's
new little macro for single bionics category.
split tools bionics.
more bionic splits: neuro & sensory
splitting a few more bionics
more splittage. 4 combined modules remaining.
Done splitting bionics.

Batteries are still the only special case.
LMOE and Cabins
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA into merge_LMOA
implemented a word rewrapper,

so that it looks less terrible using the same descriptions
for bionics & CBMs
Made changes to allow resizing the ingame viewport.
Added a couple lines to the Makefile where the desired size can be set.
Don't use blinking colors, ever.
Added vikeys to the "List nearby items" window.
Add radio beacon to LMOE shelters.
Add coordinates to some radio stations.
Added random cougar attack in wilderness area.

Conflicts:

	mapdata.h
	mapgen.cpp
	omdata.h
Purge Oddzball notes to self.
FemaCampDDAMerge
FemaCampDDAMerge
Change place_radios to a switch statement to accomodate more entries neatly.