Added setting.py.tmpl, added basic instructions for installation to README.md, and updated
to Django 1.5.1
Update README.md

updated install instructions and added ubuntu linux instructions
Update README.md

added jquery-watermark plugin for showing hints when input field is not in focus.
Update README.md

added a third party typeahead plugin
More TSS stuff (potentially to be removed later?)
Some affiliated institution stuff
Merge remote-tracking branch 'wtsi/master' into merge_josh

Conflicts:
	DNAOrderApp/order/templates/order/project-list.html
	DNAOrderApp/urls.py
Remove superfluous stuff