add Bundler support
Updated gitignore
Big update
Merge branch 'master' of github.com:gillesdemey/Codex

Conflicts:
	Gemfile
	Gemfile.lock