Removed database mocking code, replaced with a live connection to the database
Merge branch 'database' into api_nomock
Unify code after putting SQL fix in separately into two separate branches.
Merge branch 'database' into api_nomock
Merge branch 'master' of https://github.com/buttonmen-dev/buttonmen
Merge remote-tracking branch 'upstream/master' into api_nomock
* move grunt utilities into a util/ subdirectory, and make a script
  for installing grunt dependencies
Merge pull request #40 from cgolubi1/database

install database in pagoda Boxfile, and clean up database init code
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into infrastructure
Merge pull request #41 from cgolubi1/infrastructure

move grunt utilities into util/grunt/
Merge branch 'api_nomock' into api_nomock_merged
Updated grunt instructions, added copy of the .jshintrc file.
Changed element retrieval of arrays returned by function calls to be compatible with PHP 5.3
Removed primary key attributes from SQL for association tables between open games and possible buttons/sets
Merge remote-tracking branch 'upstream/master' into api_nomock_merged
Removed duplicated dot_jshintrc file, updated README
Merge pull request #42 from blackshadowshade/api_nomock_merged

BMInterface now works with live database
* make some database table names more consistent
* try to fix pagodabox "increment by four" issue in database
* clarify grunt README