Fix import error and typos in scc tests
Merge pull request #3 from hagberg/scc-import

Fix import error and typos in scc tests
Allow larger number of neighbors in watts_strogatz_graph and newman_watts_strogatz_graph

previously the code

import networkx as nx
nx.watts_strogatz_graph(10,6,0.0)

would give the following error:

networkx.exception.NetworkXError: k>=n/2, choose smaller k or larger n

However, it should yield a ring network, with every node attached to 6
neighbors.

In order to obtain this, we now also need to check that we only rewire
an edge starting at a node, if the degree of that node is less than
n-1.  This avoids an infinite loop in the rewiring algorithm.
Merge pull request #890 from dschult/master

Non-recursive and faster simple_cycles
Format cycles from simple_cycles w/o last node

Cycles in networkx are represented by a list of nodes.  But
simple_cycles() repeated the last node of the cycle.  This removes
that repetition to bring simple_cycles in line with other cycle
routines.  Related discussion in #889, #890.

Also corrected some doctests and updated tests for this change.
is_directed_acyclic_graph now returns false on undirected graphs rather than raising NetworkXError.
Fix spacing
Merge pull request #897 from dschult/fix_cycles

Format cycles from simple_cycles w/o last node
Merge pull request #898 from calmofthestorm/is_directed_acyclic_fix

is_directed_acyclic_graph now returns false on undirected graphs rather ...
Clean up white space
Moved check for G.degree(u)<n-1 to inner loop

This should save time for common case of k<<n.
Also added tests for cases that used to create infinite loops.
Remove spurious debugging print statements
Merge pull request #902 from dschult/pr/894

Allow larger k for small world graph creation.
Merge branch 'master' of github.com:hagberg/networkx
Check for dot_parser to catch error importing pydot
Whitespace cleanup/formatting
Merge pull request #905 from hagberg/pydot-test

Pydot test fixes
Add config file for https://travis-ci.org
Update travis.ci config
Update travis.ci config