fix api keys... add basic routing functionality
Merge branch 'master' of ssh.trustdarkness.com:p2git