Breaking stuff
Unbreaking stuff...
Adding test.txt
Testing makefile env
Fixed issue where SLC6 needs '-std=c++0x' but SLC5 doesn't support it
Merge branch 'develop' into release-1.0