fixed some eyes
Merge branch 'master' of generation.no:neatzsche
debugging some issues with recurrent networks and Cmake
debug and reindent
merge with upstream