changing makefile due to bug in GNU make 3.81
changed the includes for tests requiring stan c++
able to use -include again
Merge pull request #1059 from stan-dev/feature/issue-1058-makefile-bug

Fixes #1058. Feature/issue 1058 makefile bug