Updated license information.
Merge pull request #7 from sgiavasis/master

Updated my 0.3.4_dev branch with Steve's master
Modified seg_preproc.py with subcortical segmentation workflow
Undid the FIRST workflow (should be in a seperate branch)
Merge branch 'master' of https://github.com/sgiavasis/C-PAC into sgiavasis-master

Conflicts:
	setup.py
Merge pull request #9 from FCP-INDI/master

Update my 0.3.4_dev branch with full 0.3.4 release
Merge pull request #325 from sgiavasis/master

Amended a line missed in the merge.
Merge pull request #11 from FCP-INDI/master

Update 0.3.4 release branch with master changes again
Added install script to ./scripts/
Merge pull request #326 from dclark87/0.3.4_release

0.3.4 release update with installs script
added install script from danny
Merge pull request #329 from stymy/0.3.4_development

added install script from danny
Merge pull request #12 from FCP-INDI/master

Install comments added
Fixed typo in README.md
Merge pull request #330 from dclark87/0.3.4_release

Fixed typo in README.md
Merge pull request #13 from FCP-INDI/master

Merge pull request #330 from dclark87/0.3.4_release
Updated readme in install tarball
Merge pull request #331 from dclark87/0.3.4_release

0.3.4 release, updated typo in readme in cpac_install_ubuntu tarball
change install script name
Merge branch '0.3.4_development' of https://github.com/stymy/C-PAC into stymy

Conflicts:
	README.md