new branch v0.7.x
fixing setup issues
work in silverton
Merge branch 'v0.7.x' of /media/jeff/Cruzer Blad/adminion into v0.7.x
still rearranging a bit. noticed weird TTL error...
work in silverton
i can't believe I left that file in there...
Merge branch 'v0.7.x' of github.com:adminion/adminion into v0.7.x

Conflicts:
	config.default.json
	config.json
	lib/config.js
	lib/data/index.js
	lib/data/models/account.js
	lib/data/models/chatLog.js
	lib/data/models/eventLog.js
	lib/data/models/game.js
	lib/data/models/player.js
	lib/debug.js
	lib/env.js
	lib/index.js
	lib/transport/http/public/cardSelect/Cards.html
	lib/transport/http/public/cardSelect/cardDisplay.js
	lib/transport/http/public/cardSelect/cards.js
	lib/transport/http/public/cardSelect/coin.jpg
	lib/transport/http/public/cardSelect/stylesheet.css
	lib/transport/http/public/gamedisplay.html
	lib/transport/http/public/images/2013-04-19 00.35.29.jpg
	lib/transport/http/public/index.html
	lib/transport/http/public/scripts/adminion.js
	lib/transport/http/public/scripts/games/lobby.js
	lib/transport/http/public/scripts/index.js
	lib/transport/http/public/scripts/jquery.js
	lib/transport/http/public/scripts/jquery.min.js
	lib/transport/http/public/scripts/moment.min.js
	lib/transport/http/public/stylesheets/gamedisplay.css
	lib/transport/http/public/stylesheets/styles.css
	lib/transport/http/public/stylesheets/stylesheet.css
	lib/transport/http/views/accounts.jade
	lib/transport/http/views/accounts/account.jade
	lib/transport/http/views/accounts/foo.js
	lib/transport/http/views/accounts/layout.jade
	lib/transport/http/views/accounts/update.jade
	lib/transport/http/views/errors/404.jade
	lib/transport/http/views/errors/500.jade
	lib/transport/http/views/errors/layout.jade
	lib/transport/http/views/games.jade
	lib/transport/http/views/games/404.jade
	lib/transport/http/views/games/game.jade
	lib/transport/http/views/games/layout.jade
	lib/transport/http/views/games/lobby.jade
	lib/transport/http/views/games/play.jade
	lib/transport/http/views/layout.jade
	lib/transport/http/views/logon.jade
	lib/transport/http/views/register.jade
	lib/transport/http/views/root.jade
	lib/transport/index.js
	lib/transport/public/cardSelect/Cards.html
	lib/transport/public/cardSelect/cardDisplay.js
	lib/transport/public/cardSelect/cards.js
	lib/transport/public/cardSelect/coin.jpg
	lib/transport/public/cardSelect/stylesheet.css
	lib/transport/public/gamedisplay.html
	lib/transport/public/images/2013-04-19 00.35.29.jpg
	lib/transport/public/index.html
	lib/transport/public/scripts/adminion.js
	lib/transport/public/scripts/games/lobby.js
	lib/transport/public/scripts/index.js
	lib/transport/public/scripts/jquery.js
	lib/transport/public/scripts/jquery.min.js
	lib/transport/public/scripts/moment.min.js
	lib/transport/public/stylesheets/gamedisplay.css
	lib/transport/public/stylesheets/styles.css
	lib/transport/public/stylesheets/stylesheet.css
	lib/transport/sms.js
	lib/transport/ssl.js
	lib/transport/views/accounts.jade
	lib/transport/views/accounts/account.jade
	lib/transport/views/accounts/foo.js
	lib/transport/views/accounts/layout.jade
	lib/transport/views/accounts/update.jade
	lib/transport/views/errors/404.jade
	lib/transport/views/errors/500.jade
	lib/transport/views/errors/layout.jade
	lib/transport/views/games.jade
	lib/transport/views/games/404.jade
	lib/transport/views/games/game.jade
	lib/transport/views/games/layout.jade
	lib/transport/views/games/lobby.jade
	lib/transport/views/games/play.jade
	lib/transport/views/layout.jade
	lib/transport/views/logon.jade
	lib/transport/views/register.jade
	lib/transport/views/root.jade
	package.json
	public/cardSelect/Cards.html
	public/cardSelect/cardDisplay.js
	public/cardSelect/cards.js
	public/cardSelect/coin.jpg
	public/cardSelect/stylesheet.css
	public/gamedisplay.html
	public/images/2013-04-19 00.35.29.jpg
	public/index.html
	public/scripts/adminion.js
	public/scripts/gameLobby.js
	public/scripts/index.js
	public/scripts/jquery.js
	public/scripts/jquery.min.js
	public/scripts/moment.min.js
	public/stylesheets/gamedisplay.css
	public/stylesheets/styles.css
	public/stylesheets/stylesheet.css
	server.js
	setup/setup.sh
	views/accounts.jade
	views/accounts/account.jade
	views/accounts/create.jade
	views/accounts/foo.js
	views/accounts/layout.jade
	views/accounts/update.jade
	views/errors/404.jade
	views/errors/500.jade
	views/errors/games/404.jade
	views/errors/games/layout.jade
	views/errors/layout.jade
	views/games.jade
	views/games/game.jade
	views/games/lobby.jade
	views/games/play.jade
	views/layout.jade
	views/logon.jade
	views/root.jade