shell: remove clutter from shell's Makefile

Remove clutter that was put into centralized Makefile.includes.
Merge pull request #857 from Kijewski/shell-remove-clutter

shell: remove clutter from shell's Makefile
Fix neighbor discovery