diff --git a/data/rebuild_db.php b/bin/rebuild_db.php
old mode 100644
new mode 100755
similarity index 72%
rename from data/rebuild_db.php
rename to bin/rebuild_db.php
index ec5bb7b..3bfc944
--- a/data/rebuild_db.php
+++ b/bin/rebuild_db.php
@@ -1,7 +1,8 @@
+#!/usr/bin/env php
 <?php
 
 // determine where the sqlite DB will go
-$dir = __DIR__.'/oauth.sqlite';
+$dir = dirname(__DIR__) . '/data/oauth.sqlite';
 
 // remove sqlite file if it exists
 if (file_exists($dir)) {
@@ -15,8 +16,8 @@
 $db->exec('CREATE TABLE oauth_access_tokens (access_token TEXT, client_id TEXT, user_id TEXT, expires TIMESTAMP, scope TEXT)');
 $db->exec('CREATE TABLE oauth_authorization_codes (authorization_code TEXT, client_id TEXT, user_id TEXT, redirect_uri TEXT, expires TIMESTAMP, scope TEXT)');
 
-// add test data
-$db->exec('INSERT INTO oauth_clients (client_id, client_secret) VALUES ("demoapp", "demopass")');
+$db->exec('CREATE TABLE oauth_refresh_tokens (refresh_token TEXT, client_id TEXT, user_id TEXT, expires TIMESTAMP, scope TEXT)');
+$db->exec('INSERT INTO oauth_clients (client_id, client_secret, redirect_uri) VALUES ("demoapp", "demopass", "http://localhost/demo/authorized")');
 
 chmod($dir, 0777);
 // $db->exec('INSERT INTO oauth_access_tokens (access_token, client_id) VALUES ("testtoken", "Some Client")');
diff --git a/composer.json b/composer.json
index dca9c68..542024e 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "require": {
         "silex/silex": "1.0.*",
         "symfony/twig-bridge": "2.1.*",
-        "bshaffer/oauth2-server-php": "dev-develop",
+        "bshaffer/oauth2-server-php": "dev-master",
         "bshaffer/oauth2-server-httpfoundation-bridge": "dev-master"
     },
     "autoload" : {