Merge branch 'master' into issues_AE

Author: dcwhite

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,31 @@
-TODO
+### Prerequisites
 
-In the new file, add your issue template. This could include:
+* [ ] Are you running the [latest version of SCIRun](https://github.com/SCIInstitute/SCIRun/releases)?
+[//]: # (* [ ] TODO: Did you check the [debugging guide](http://flight-manual.atom.io/hacking-atom/sections/debugging/)?)
+[//]: # (* [ ] TODO: Did you check the [FAQs on Discuss](https://discuss.atom.io/c/faq)?)
+* [ ] Are you reporting to the [correct repository](https://github.com/SCIInstitute/SCIRun)?
+* [ ] Did you [perform a cursory search](https://github.com/SCIInstitute/SCIRun/issues) to see if your bug or enhancement is already reported?
 
-    Expected behavior and actual behavior.
-    Steps to reproduce the problem.
-    Specifications like the version of the project, operating system, or hardware.
+For more information on how to write a good [bug report](https://github.com/atom/atom/blob/master/CONTRIBUTING.md#how-do-i-submit-a-good-bug-report) or [enhancement request](https://github.com/atom/atom/blob/master/CONTRIBUTING.md#how-do-i-submit-a-good-enhancement-suggestion), see the `CONTRIBUTING` guide. These links point to another project, but most of the advice holds in general.
 
-Example:
-https://github.com/atom/atom/blob/master/ISSUE_TEMPLATE.md
+### Description
+
+[Description of the bug or feature]
+
+For Mac crash bugs, please *DO NOT* paste an entire MacOS crash report here. Edit it down to just the stack trace of the thread that crashed, along with the general system info on the top.
+
+**In all bug cases, some combination of screenshots, sample network(s), and input data should be attached. You can use any cloud storage links you want for networks and data.**
+
+### Steps to Reproduce
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:** [What you expected to happen]
+
+**Actual behavior:** [What actually happened]
+
+### Versions
+
+You can get this information from executing `SCIRun --version` at the command line, or clicking on the version button in the bottom right corner of the GUI (which copies the version to the clipboard). Also, please include the OS and what version of the OS you're running.

.travis.yml

@@ -35,8 +35,8 @@ install:
 # hopefully make OS X builds a bit faster
 script:
   - cd bin
-  - cmake -DDOWNLOAD_TOOLKITS:BOOL=OFF -DRUN_BASIC_REGRESSION_TESTS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF ../Superbuild
-  - make -j4
+  - cmake -DDOWNLOAD_TOOLKITS:BOOL=OFF -DBUILD_TESTING:BOOL=OFF ../Superbuild
+  - make -j8
 #  make SCIRunTestData_external
 #  && make test