only overwrite startup config if we have elements in our passed in
config
Merge pull request #199 from petercable/startup_config

only overwrite startup config if we have elements in our passed in
Changes to nose test to get ingestion test to work (Bill F wrote).
Merge branch 'test_branch', remote branch 'upstream/master' into test_branch