First take for model/view
Merge pull request #4 from comzeradd/model

First take for model/view
Enable south migrations.

* Add neo app to anapneo
* Add initial migration to neo
* Changes in requirements.txt
Merge pull request #5 from johngian/enable_south

Enable south migrations.
Initial templates and css fixes
Merge pull request #9 from ppapadeas/base_templates

Initial templates and css fixes
persona integration
Merge pull request #15 from comzeradd/persona

Persona integration (fixes #6)
Implement initial URL routing for neo app
Merge pull request #14 from johngian/fix_urls

Implement initial URL routing for neo app
Correct view names + add admin.py
Merge pull request #17 from achronop/master

Correct view names and add admin.py
Remove view profile_edit
Merge pull request #19 from achronop/master

Remove view profile_edit
Static pages and base page fixes
Merge branch 'Nav_bar' of git://github.com/ppapadeas/anapneo into ppapadeas-Nav_bar

Conflicts:
	anapneo/neo/urls.py
	anapneo/neo/views.py
Added requirements for heroku deployment
Merge branch 'master' of git://github.com/hsgr/anapneo into heroku
Added local_settings
Changed web command