Change Travis-ci build badge to point to jpfuentes2
Fix whitespace
Merge pull request #374 from jpfuentes2/fix_whitespace_in_singleton

Fix whitespace
Added option for multiple model directories
Added tests