First commit on new branch
Merge remote-tracking branch 'upstream/master'
Adjustments to get it running locally.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	run.py
Merge remote-tracking branch 'upstream/master'
Rough api search implementation. POC
Syncing regular account. (Not quite sure this is the best way)
Cleaned up container "search". Still needs work!
Merge branch 'master' into container_search
Cleaned "search"
Fixed run
Removed import scripts
Actually removed core files
Merge pull request #3 from mike6856/master

Basic key/value container search
resolved merge conflict

Merge branch 'master' of github.com:ephur/crud_config into extend_auth

Conflicts:
	.gitignore
	tools/init_db.py