added API endpoints for PEPs
added missing newline
Merge branch 'refs/heads/master' into features/api/peps
added `contrib.redirects` and show pages using a fallback middleware. Close #229
added tests for peps api endpoint
upgrade django-pipeline to fix README encoding issue
update links for python 3.4
move /documentation to /doc like it is on the old site
Update vagrant environment for local development

* Update packages that can't run with vagrant's pty-less connection
* Use deadsnakes ppa for python3.3 installation to mitigate FTP slowness installing from source
* Update python cookbook
* Downgrade apt cookbook to one that supports the version of chef
Merge pull request #311 from proevo/vagrant_fixes

Update vagrant environment for local development
Fix postgresql locale and encoding.

The chef database cookbook was also updated
Merge pull request #318 from proevo/vagrant_fixes

Fix postgresql locale and encoding.
company relation made blankable and nullable with default of null for migration
add company name field
add company description field
add job title field
hack to fix admindocs bug
add comment about hack
Merge branch 'admindocs-hack'; see #317
backport some more of the admindocs fix