Added "if" statements to prevent illegal neighbors in short_range. This is
somewhat of a hack to make the code work.
Moved some short_range method calls around to avoid more if statements...
this seems to have broken the code. Also added in some testing code which
can be removed at a later time.