merge conflict. and also make npm dependencies really beautiful
Merge pull request #2 from paulcpederson/master

REALLY IMPORTANT PULL REQUEST