merge
merge
de-smart config
npm
after much pain, just moved bitly to client side
basic graphing
more than just kanye
Merge branch 'bitly'