Merge pull request #11 from trilliput/master

Improvemented template system
Update README.md
Accounts init #19
Add Travis badge
Basic registration #19
basic travis settings #21
add pep8 to travis settings #21
add deploy.json
add deploy.json
change button text
bootstrap, django-bower and topbar #23
new commands in deploy.json
Issue #20
Clean code.
Rename zen.py to zen_lines.py because it rises ImportError.
Merge pull request #24 from GomZik/master

PEPify code
Issue #20
Change imports order.
more pep in settings
Merge branch 'master' of github.com:averrin/emergent
django to travis
django to travis #21
django to travis #21