added BatfishException missing from last commit
Merge remote-tracking branch 'origin/unstable' into ratul
starting to add support for templates in nx-os
unit test for peer templates