Embedding custom bottle.py.
Now using embedded bottle.py
Merge branch 'master' of http://github.com/abingham/traad into HEAD

Conflicts:
	traad/server.py