Add .gitignore in addition to .gitignore_global
Add standard ignore file for git
config for IntelliJ IDEA 13
Merge pull request #358 from dsager/intellij-idea-13

Config for IntelliJ IDEA 13
Add license path for Dash
Merge pull request #361 from webpro/dash-license

Add license path for Dash
Fix spelling mistake
Merge pull request #365 from danielcompton/patch-1

Fix spelling mistake
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