merge in changes from django-ninfo that fix cidr searches.

Upgrade angular to 1.2.6 and tweak routing arguments