Added redirects to unwanted urls
Added breadcrumbs to transcription pages
Merge branch 'beautify'

Conflicts:
	thin/views.py
Merge branch 'unwanted-url-redirects'
Made keyboard fixed to bottom of page instead of attached to footer
Merge branch 'master' of github.com:tu-software-studio/websurv
doing more transcriptions stuff
conflicts
Added new gource video
Merge branch 'master' of https://github.com/tu-software-studio/websurv
Finishing up transcription CRUD
Merge branch 'ipa-keyboard'
Testing Jenkins.
Update README.org
Update README.org
Still testing Jenkins.
Merge branch 'master' of github.com:tu-software-studio/websurv
Merge branch 'master' into comparisons

Conflicts:
	thin/views.py
Fix for merges
Rename stuff to be shorter