Add some special cases
Add some special cases

Remove the special dictionary and merge it into main dictionary
Add functions for all special cases, although majority empty
Fill out the special function for B?POP
Also remove some lines that were previously commented out that broke the
previous commit (not applied to that as only discovered after it had been
pushed)

shaywood/srobo-compdis,shaywood/srobo-compdis,shaywood/srobo-compdis