Minor fix to Environment.
Merge branch 'master' of git://github.com/ivh/VAMDC-VALD
vald broadening fixes
Merge remote branch 'samuel/master'
A first complete version of the "quickstart" documentation for VAMDC.
Minor fixes to the quickstart text.
Lund node: Fixed and updated to latest version of NodeSoftware, fixed regression in how transitions references its related states.
Merge branch 'master' of github.com:Griatch/VAMDC-VALD
Fixes to get the Lund node running with Django 1.4.3 and Debian Wheezy
Update quickstart.rst

Fix link, prereqs.html -> prereq.html
add defalt log filter to settings_default.py to get rid of deprecation warning
fix test suite
add examplenode flag to auto-generated settings
New example node: atomic-spectroscopy database stripped down for Chianti-7. Data files (which are tiny) are included.
Merge pull request #120 from guyrixon/master

New example node: "tignanello"
add MinimalNode/ which is a copy of the ExampleNode, stripped from all bells & whistles. useful for tutorial
updates for django 1.6
vald node updates for django 1.6
Merge branch 'master' of github.com:ivh/VAMDC-VALD
merge master