Merge branch 'master' of https://github.com/davezerave/dot

* 'master' of https://github.com/davezerave/dot:
  Adding further ignores
  Adding khal settings to repository
  SuperCollider startup file for electronic studio
  Adding terminology settings directory
  Adding amSynth settings
  Adding settings file for baudline.
  Adding arduino settings
  Moving mpd ignores to .config/mpd
  Adding electronic studio setup
  Adding mpd.conf to .config/mpd/ directory
  Adding automatic symlinking of shotwell folder upon mount of photos harddrive
  Relocating .mpd directory to .config/mpd

1 files changed, 22 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index ba930dd..ca07228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,7 @@ svn/
 .config/guitarix/
 .config/htop/
 .config/ibus/
+.config/icedtea-web/
 .config/inkscape/
 .config/ipython/
 .config/jack/
@@ -118,6 +119,14 @@ svn/
 .config/libreoffice/
 .config/lxterminal/
 .config/mate/
+.config/mpd/folders/
+.config/mpd/mpd.db
+.config/mpd/mpd.log
+.config/mpd/mpd.pid
+.config/mpd/mpdstate
+.config/mpd/playlists/
+.config/mpd/sticker.sql
+.config/menus/
 .config/nautilus-actions/
 .config/nautilus/
 .config/octave/
@@ -130,6 +139,7 @@ svn/
 .config/rubyripper/
 .config/sound-juicer/
 .config/synergy-dvzrv.conf
+.config/systemd/
 .config/termite/.asound.conf
 .config/tint2/
 .config/user-dirs.locale
@@ -144,9 +154,12 @@ svn/
 .dmrc
 .docear/
 .dropbox-dist/
+.dropbox-master/
 .dropbox/
 .dvdcss/
+.dvdrip*
 .editrc
+.electrum/
 .escaped_colors.rb
 .esd_auth
 .envtab
@@ -195,6 +208,7 @@ svn/
 .jdownloader/
 .kde4/
 .keychain/
+.khal/
 .lesshst
 .lfm_history
 .lives
@@ -207,6 +221,7 @@ svn/
 .local/share/birdie/
 .local/share/comix/
 .local/share/data/
+.local/share/fontconfig/
 .local/share/gegl-0.1/
 .local/share/gegl-0.2/
 .local/share/goobox/
@@ -221,6 +236,7 @@ svn/
 .local/share/shotwell
 .local/share/spacepiratesandzombies/
 .local/share/systemd/
+.local/share/Trash/
 .local/share/telepathy/
 .local/share/vlc/
 .local/share/webkit/
@@ -235,15 +251,9 @@ svn/
 .mozilla/firefox/Crash Reports/
 .mozilla/firefox/dvzrv
 .mozilla/firefox/dvzrv-backup/
-.mpd/folders/
-.mpd/mpd.db
-.mpd/mpd.log
-.mpd/mpd.pid
-.mpd/mpdstate
-.mpd/playlists/
-.mpd/sticker.sql
 .mpdscribble/
 .mplayer/
+.muttator/
 .mysql*
 .ncftp/
 .neocomplcache/
@@ -252,6 +262,8 @@ svn/
 .nicotine/
 .nvidia-settings-rc
 .octave_hist
+.p7zip
+.password-store/
 .pdextended
 .pdfedit/
 .pdirc
@@ -262,6 +274,7 @@ svn/
 .pryrc
 .pulse
 .pulse-cookie
+.purple/
 .python-eggs/
 .q3a/
 .qt/
@@ -293,6 +306,7 @@ svn/
 .texlive/
 .thumbnails/
 .thunderbird/
+.trousers/
 .ts3client/
 .tuxguitar-1.2/
 .unescaped_colors.rb
@@ -301,6 +315,7 @@ svn/
 .vimperator/
 .vimpressrc
 .vimrc
+.viminf*
 .vmoviedb/
 .wireshark/
 .wolf3d/