Cleaned git repo up a bit
Merge branch 'test' into devel