Fixed modules that support both node and amd not using the amd definition.
Fix code formatting
Merge remote-tracking branch 'remotes/upstream/master' into module-type-fix-squashed
Mistakenly thought that moduleType could be either an array or not an array - simplified code because it's always an array.

Conflicts:
	lib/parse.js
Test for #89 Modules that support both AMD and node use node
Merge pull request #90 from SneakyMax/module-type-fix-squashed

Fixes #89 Modules that support both AMD and node use node