Commented out two tests that fail on Travis CI.
Changed name of the develop branch to development for travis.yml.
Merge branch 'development'
Fixed problem with the text predicates.
Added tests for predicate_mgr.
Fixed playtester method call.
Merge pull request #1 from csdl/master

pull from csdl
disabled group related scoreboards
preserve the group related scoreboard templates
Merge branch 'master' of github.com:yongwen/makahiki
Merge pull request #551 from yongwen/master

merge disabled group related scoreboards
Merge pull request #552 from jtakayama/master

Vagrant pull request.
Merge pull request #553 from jtakayama/master

Requesting pull of Vagrant files.
Merge pull request #554 from jtakayama/master

The bootstrap.sh script now initializes the database.
Changed the WattDepot URL to point to WattDepot running on Mopsa.
fix memcache setting for vagrant
fix memcache setting for vagrant
Merge http://github.com/csdl/makahiki