Add .gitignore in addition to .gitignore_global
Add standard ignore file for git
Terminator (terminal emulator) configuration added.
Fixed name typo
Merge pull request #369 from chr1sbest/master

Terminator (terminal emulator) configuration added.
Update path to latest Textual plist file location.
add support for pass (http://www.passwordstore.org/)
Added support for rubocop config

https://github.com/bbatsov/rubocop
add support for composer
Merge pull request #373 from kykim/master

add support for pass (http://www.passwordstore.org/)
Merge pull request #375 from iainbeeston/rubocop

Add support for rubocop
Merge branch 'composer' of github.com:fayland/mackup into fayland-composer

Conflicts:
	CHANGELOG.md
Merge branch 'fayland-composer'
added ghci
Merge branch 'add-gitignore' of github.com:eyadsibai/mackup into eyadsibai-add-gitignore

Conflicts:
	CHANGELOG.md
Merge branch 'eyadsibai-add-gitignore'
updated readme anc changelog adding GHCi
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CHANGELOG.md
Merge pull request #384 from MarcoSero/master

Added support for .ghci
Add support for Spectrwm