merge of features from hosted branch (#7)

major merge of features from the hosted branch that was created temporarily during the initial launch of jambonz.org

lib/routes/api/api-keys.js

@@ -5,7 +5,7 @@ const Account = require('../../models/account');
 const decorate = require('./decorate');
 const uuidv4 = require('uuid/v4');
 const assert = require('assert');
-const sysError = require('./error');
+const sysError = require('../error');
 const preconditions = {
   'add': validateAddToken,
   'delete': validateDeleteToken