Squashed '.vim/bundle/syntastic/' changes from cf6aa9a..e5dfcc3

e5dfcc3 Merge pull request #307 from superjoe30/master
f81b031 css checker: add syntastic_csslint_options variable
ab59e7d perl: namespace the 'perl_lib_path' option under 'syntastic'
f99073e perl: refactor the new syntastic_perl_efm_program option
7154419 Merge pull request #309 from harleypig/master
82e976c Merge pull request #310 from roshambo/master
fc8ea66 Fixed typo in the about section in the docs.
fb18ea1 add support for a custom efm_perl program
9836081 add another error format to coco language
5e32635 add support for coco language
1fb8366 Merge pull request #244 from mootoh/master
6b752cd Merge pull request #246 from lervag/master
cfd41f1 Enable user-specified Ruby interpreters.
d1c18c2 Merge pull request #296 from novocaine/master
cdd36c6 populate the location list when :Errors is called
5ea166c coffee checker: refactor and change the coffee_lint option name
39cfb51 coffee checker: fix mixed indenting
1836449 Merge remote-tracking branch 'brendanjerwin/master'
6818c45 ruby/mri checker: fix a compatibility bug
0f73bba Fix warning suppression in MRI 1.9.3
4cc6d8b Improved the behavior per suggestions
6e2b7dd ruby/mri checker: make it display warnings
a030c4f add help tags for other sign options
688e5d0 Merge pull request #295 from 3rd-Eden/patch-1
5ec845e Added configuration option for the symbols that are used in the signs. This allows users to configure their own indicators symbols
94dcae2 Merge pull request #291 from CharlesStain/master
a42a2fd Merge pull request #299 from brendanjerwin/master
4310146 Include CoffeeLint if available.
d14a2b7 add support for g:syntastic_cpp_compiler
7b3b63e Merge pull request #292 from kongo2002/c_errorformat
341d878 improve C++ errorformat as well
2f69e0b extend C errorformat
aaacd75 Let user configure errorformat string in c/cpp syntax checkers.
2447d9d Added an Ada barebone checker
3ea9d60 Merge pull request #289 from szw/master
bf56b92 Adds jruby errorformat
5299296 Merge pull request #282 from khussein/perl_Ilib
f67266e Improves the Perl syntax checker to include lib
25e81cb Merge pull request #279 from johntyree/master
03c5778 Pass arch flag to header check as well.
405363d Added documentation for new Cuda arch flag.
60a3588 refactor the checks for the shell/shellpipe hack compatability
f5c63d9 Merge remote-tracking branch 'qbit/master'
f75fbc8 Merge pull request #275 from eharmon/master
1ae9c3a Merge pull request #281 from latestrevision/master
176514b Merge pull request #284 from ixti/patch-1
f3fa0e7 Fix js-yaml (CLI) installation instructions
89e22ba Modifying pylint checker such that it displays both the original pylint error code as well as translating said error codes into syntastic-compatible Error and Warning messages.
3951845 Add global option to set cuda arch.
2939697 Fixing merge error
1e94b98 Merge remote-tracking branch 'eharmon/master'
b2d4810 Merge pull request #259 from jewel/master
7828cd4 Merge pull request #271 from CharlesStain/master
9134943 Merge pull request #273 from lelutin/puppet_lint_arguments
d798286 Enable pass arguments to puppet-lint
978fdbc Cleaned the license section
716a274 Added a baredone D checker
5c4697a Remove some working notes
979258d Make sure we add some contact info
9833b00 Add warnings support to perl checker
ec9bf2e Merge pull request #265 from powerman/efm_perl
1e99ed5 Fix: efm_perl missed some error messages
e315263 Add fix for OpenBSD
687ecc7 Disable sass cache creation
025fa81 Merge pull request #245 from xuhdev/remove-useless-win64-check
6e7ac39 Merge pull request #247 from irrationalfab/master
acdffb3 Merge pull request #249 from jrk-/master
a24e07a A very basic syntax checker for java files.
1158999 Added MacRuby/RubyMotion syntax checker.
be72bc3 Added syntax checker for lisp
30d7462 Remove some unnecessary win64 checks.
0faf1bd Added an option: g:syntastic_javascript_closure_compiler_file_list
b94510f Do not check if the syntax_checker exists and is executable.
3e6687e s/gcc/closurecompiler/
2d0bb48 1 byte typo.
243becc Javascript syntax check with Google Closure Compiler.
7fc5246 html: rename w3c.vim to w3.vim (i fail @ naming files!)
5c159fd html: split the checkers into separate files
fd297d7 html: fixed mixed indenting
976fa99 Merge remote-tracking branch 'daniel-walker/w3-validator'
03a58be puppet: fix a bug with the syntastic_puppet_lint_disabled option
6829178 Merge pull request #238 from jondavidjohn/master
0e9927c Add another PHP error clause to the list of parsables
5c7f2b8 Merge pull request #227 from mschulkind/master
4611645 Stop clobbering global options.
96fd02e Merge pull request #229 from leepa/master
7deb54d Merge pull request #228 from kisielk/patch-2
5c0074f Merge pull request #223 from Fruneau/filter-out-invalid
0278642 Merge pull request #222 from ldx/c_configfile_fix
4eb1a0e Modify the html checker to optionally use http://validator.w3.org/ instead of tidy.
02e510e Don't shoe horn 'syntax error' everywhere
16a7a87 Build all files with go build
4b61f4b Merge pull request #224 from kisielk/patch-1
315e1ad support column number in go syntax checker
3cac7f3 go syntax checker using 'go build'
999d3c1 Only keep "valid" entries in the error count.
c6407e5 Fix makeprg construction for cpp too.
2ef26e1 Fix makeprg construction.
e961f17 Merge pull request #220 from kongo2002/c_config
d868417 Merge pull request #218 from dag/master
0f1ea02 add ReadConfig to C++ checker as well
c791c31 add ReadConfig support to C syntax checker
d8f3aa5 add ReadConfig() function for C/C++ checkers
8d6fe0d haskell: configurable ghc-mod arguments, default to support for HSP
b4e85a8 python/flake8: assume all outputs are errors - not warnings
62fb4e7 php: set error_reporting=E_ALL
0fab9ef Merge pull request #214 from jamezpolley/master
39881cd Merge pull request #216 from kstep/vala-modules
3cc6bf5 vala: g:syntastic_vala_modules variable to set modules list via vim script
7cd8efe Fixes #202 - redict stderr in a way that doesn't break on versions of bash <4.0
3c569d2 pass a filetype to SyntasticLoadChecker
abd55ed Merge pull request #209 from bram85/master
a6be206 Safely fetch the 'col' key of an error, it may not exist.
5be83cd Merge pull request #201 from bukzor/master
a938352 python/pylint: add g:syntastic_python_checker_args
53c70fe Merge remote-tracking branch 'parantapa/master'
4eafc68 Merge pull request #207 from critpizza/master
4c8ee38 Abstracted the makeprg selection for puppet away into its own function
ca6a4b2 Added puppet-lint support with the use of subtypes
1a91488 prevent stderr from messing up the terminal, in the (usual) case of no pylintrc found
9f1cdfd Merge pull request #200 from bukzor/master
c039b0f fix pylint parsing
ed515fc Merge pull request #198 from kongo2002/cpp_compiler_options
adedb47 refactoring of GetIncludeDirs() for C/C++
6ce5880 set default C compiler options
c11c97d fix compiler options for C as well
85c347c fix custom c++ compiler options
7a5bca3 Merge pull request #197 from kongo2002/cpp_include_dirs
441506c cpp: add option to remove include errors
d81b360 add missing doc comment
8e2634a add include directory functionality to cpp
760d845 Fix pylint error format string
630a57d ruby: add the structure for jruby support
892cc2c refactor the error highlighting system
1f91303 php: prevent error duplication
de9f81b add an FAQ to the readme
637182c python/pyflakes: report errors by default
66e69dc Revert "Revert "Spent a while trying to figure out why :helptags wasn't working properly with pathogen, but it turns out the h has to be capitalized.""
d88c76b Merge pull request #192 from tpievila/master
1576798 Show only real warnings in ReST
c97042a Merge remote-tracking branch 'artnez/php-force-display-errors'
6b643c8 Merge pull request #174 from lucash/master
40374f1 Revert "Spent a while trying to figure out why :helptags wasn't working properly with pathogen, but it turns out the h has to be capitalized."
b5bf08a Merge pull request #188 from aripollak/patch-1
ad42147 Spent a while trying to figure out why :helptags wasn't working properly with pathogen, but it turns out the h has to be capitalized.
bcfdab6 python: bugfix to pyflakes checker
c5616d2 php is now forced to display parse errors, even in production environments
d09c330 Merge pull request #181 from rickeyski/master
70a0574 scala language plugin
936f140 Merge pull request #180 from harpyon/master
5d1adc5 Small NASM syntax checker fix.
8ed2518 Merge pull request #178 from harpyon/master
b2ec20b Merge pull request #177 from rgiot/master
d454a00 split python checker out into 3 files
debae42 NASM syntax checker fixes.
90b7a37 Added NASM syntax checker.
d751322 Merge remote branch 'upstream/master'
22d8063 Add z80 assembly language
b4a7d47 performance improvements: cache errors and warnings explicitly
e444945 minor performance improvements to the statusline function
9594d34 performance improvements for FilterLocList()
c751a5a php: fix output of lint if display_errors is off
3e80184 bump to v2.3.0 and update changelog and credits
08d30df Merge pull request #172 from frimik/puppet-storeconfigs
f4a2433 puppet: enable --storeconfigs on 2.7
cb62052 puppet: update errorformat to ignore a general message
6d34c70 puppet: skip --ignoreimport for versions >= 2.7.10
7781a70 Merge pull request #171 from pneff/python-args
a79d079 Additional parameter for Python checker
253cfe3 Merge pull request #170 from gillesruppert/master
be1091f rather than compare to '' we use the vimscript `emtpy` function as else the check does not work
3be5136 go: add gofmt checker from #150
8276502 rust: remove the explicit color codes
b58ca4b rust: update a couple of comments
ddb7895 Merge pull request #169 from cjab/rust-syntax-checker
fda546f add rust syntax checker
c2c0058 make the ternary check for the javascript jshint config explicit as else it was not working on my system
206c809 update changelog
9a6895d add syntastic_loc_list_height option
5e43893 perl: fix the makeprg - I failed in the previous commit
9a5eda8 haxe: fix the permissions on the checker file
ddecc79 perl: add the output munger to the repo
258812a puppet: fix the puppet version number extraction
0b10a2e update changelog and credits
2f796a7 puppet: fix indenting - make it consistent at 4 spaces
b4e7f85 puppet checker: only check the version once
b30a9fa update some comments to reflect the new subtype functionality
0de450d simplify how the 'subtype' option is added to errors
6ffdf6e Merge pull request #168 from zsprackett/puppet-version-fix
2b514d8 Merge pull request #158 from technosophos/master
d0a7546 Make this work with releases > 2.7
516b2ee Per #158: Removed SubtypeMasksType.
51a9e96 Per #158 (and #155): Turning empty() check back on.
fa1084c DRY up the code that loads checkers when multiple exist
111b012 Merge pull request #163 from naoina/master
a2e7ef0 Fix the error that occurs when using Python 3.x and written the '#include <Python.h>' in the .c file
ad1481c Merge pull request #152 from irrationalfab/master
3bb2b7f Merge pull request #160 from acarapetis/patch-1
d4683b3 bugfix from Michael Ludwig for VIMRUNTIME paths with spaces (e.g. on windwos)
8df5c3b Added support for error/warning subtyping.
10f4d4d Merge pull request #156 from mitchellh/master
c6d464b Python executable check should use the variable, not a string
31970a8 Merge pull request #155 from AD7six/feature/php-no-phpcs-on-parseerror
7fedd20 only run phpcs if the file has no syntax errors.
1724155 less: improved errorformat for v1.2 * previous version would skip "NameError" and potentially other errors * introduced support for the capture of the error message
fe5b898 less: simplify 1.2 errorformat and split errorformat up
42ea342 cuda: simplify/fix the executable checking
ae5171e Merge pull request #147 from irrationalfab/master
e603586 removed .DS_Store and added it to .gitignore
74d4560 Merge pull request #145 from darcyparker/master
f521a0c Merge pull request #143 from edwintorok/master
3dfcd1a Merge pull request #149 from AD7six/patch-1
1ef8a5b Merge pull request #148 from parantapa/master
331e821 ocaml: only run ocamlbuild if _build already exists
c7380d7 drop locaml syntax
cb1d8c1 ocaml syntax: handle warnings and ignore some ocamlbuild messages
4b68c72 Use the default coding standard which phpcs is configured to use
a01332f Add support for pylint
7e8ab5f Error format fix for less files
3989481 shellescaped(expand()) the filename passed to xmllint
10bc9fe shellescaped(expand()) the filename passed to coffee
a9685fb Merge branch 'master' of https://github.com/scrooloose/syntastic
7df01d8 Add ocamlbuild support
2616623 xml/xslt: shellescape() the filename that is passed it
469e4ef Merge pull request #142 from darcyparker/18834a35877b756049b0c241de750d8e17f0eff0
3555dc6 Merge remote-tracking branch 'upstream/master'
18834a3 Wrapped arguments with spaces that were previously wrapped in single quotes with shellescape().  cmd.exe on win32/64 does not recognize single quotes properly.  shellescape() correctly wraps arguments with spaces using double quotes on win32/64.
10e6fe5 add locaml checker and make it alias ocaml
f7072dd ocaml: fix mixed indenting
9d17fe4 Merge pull request #141 from edwintorok/master
d5cee02 add OCaml syntax checker
8ddb003 Fixed makeprg for win32 and win64 to use double quotes instead of single quotes. Now tidy can be executed properly.
4d957c8 sass: fix a bug with imports
64cb686 Merge pull request #138 from rephorm/local
9335b9d missing 'let' in fortran.vim
c05a36f jslint: update for jslint 0.1.4
cd99a2d haxe: remove a stray echo and fix a function name
c2b5cd1 haxe: make the indentation consistent
55f7ffe Merge pull request #137 from davidB/master
47dcc47 haxe: update Maintainer
78e1ea2 add basic support for haxe
c8dc739 update the readme
5413e9d make a cosmetic update to readme/screenshot
3e73282 update readme and add a screenshot
e6224d7 Merge pull request #136 from ixti/master
0d4a99c Updates js-yaml installation comment
d949b94 yaml: remove a stay line
ab1906e add yaml syntax checker
54896be bump to 2.2.0 and update changelog
466f762 add a ! to a function def
d88db85 refactor g:syntastic_check_on_open
9a9da94 evaluate g:syntastic_check_on_open without having to restart vim
9633837 dont do syntax checks when opening buffers
58cd0d3 update the javascript/jslint syntax checker
7fe7900 refactor s:AutoToggleLocList()
224fd0f update credits
2c6b271 simpify s:ModeMapAllowsAutoChecking()
d132645 Revert "remove the ability to check compound filetypes"
abc33eb update changelog/credits
a24bf02 fix a bug with EchoCurrentError
4f6ed48 Merge pull request #132 from kongo2002/haskell_efm
fc987ce parse haskell error and warning tags
d3ed7b0 Merge remote-tracking branch 'kongo2002/c_improve'
587c565 Merge pull request #130 from kongo2002/fix_errors
138e48c C: readd default include dirs
1807310 C: option to remove errors from included files (#70)
5accceb C: add some explanatory comments
309652c C: modify the default include directories
58e65d9 C: remove duplicates in include directories
ef7deb1 fix bug in s:Errors() introduced with commit 755eddaa
26b5bb8 Merge remote-tracking branch 'millermedeiros/jsonlint'
dca9e45 add millermedeiros as maintainer of JSON syntax checker.
755edda make all loclist items errors by default
fb0259a remove the ability to check compound filetypes
7c623b7 Revert "add Lclose() and use it when closing the loc list"
aeca4bf Merge pull request #127 from millermedeiros/iss-jshint_config
e4adda2 fix jshint checker since it was ignoring jshintrc configs.
2385a0b make s:FilterLocList() work on s:LocList() by default
ec3ac50 refactor b:syntastic_loclist to s:LocList() and s:ClearLocList()
1e8d54d dont do syntax checking for any file that is non standard
2698e26 add json syntax checker. see #74.
761e8e4 update changelog
e90aa61 add Lclose() and use it when closing the loc list
49e009c Merge pull request #126 from millermedeiros/iss123
d04c976 BufWinLeave is always called before BufUnload, redudant.
233f795 ops, forgot to check buftype before calling lclose, avoid calling it if not needed.
d3b122d fix loc list auto close. see #123
0d1943e auto close location list when closing or moving to another buffer. also update errors on BufEnter. see #123
d053c8d trivial refactor
bfe3725 make EchoCurrentError() not mask errors with warnings
17f9b76 dont clobber error signs with warning signs
26b45ee add a couple of "!"s to function defs - for consistency
d85130d update errors when :SyntasticToggleMode is called
d14b53e Merge pull request #122 from JNRowe/rst_checker
7539eac Added basic reStructuredText checker.
9df0367 Merge pull request #121 from JNRowe/master
b132142 Added note on speeding up validation to XML checker.
a2088eb Added basic Gentoo metadata.xml checker.
a210721 change to version 2.1.0
c5f85ca update changelog/credits
8717ff7 make a small refactor and add a comment
e34f8df insert the changelog (from 2.0.0) into the readme
9a34780 Merge pull request #120 from JNRowe/master
0b6587d Handle filetype names containing hyphens.
3c1a826 Merge pull request #119 from technosophos/master
e3c2b95 Added default setting to php.vim.
1a20c87 add a note about the google group to the readme
f51ec67 update change log and credits for next version
394d129 refactor the javascript syntax checkers
8dba3fe less checker: update the error format for the latest version
0af738a less checker: fix a syntax error
cafb55b fix a minor issue when echoing the current error
e24bd80 fix a strange bug when echoing error messages
8491df9 move the main autocmd into the syntastic augroup
8e6ebec echo the current error in the cmd win
cda7186 use custom highlight groups instead of tracking match ids
a7f5428 remove -nargs=0 from the :commands since this is the default
9f9fbbb Merge pull request #116 from zhaocai/master
6a75297 0.2.1 - remove g:syntastic_applescript_tempfile. use tempname() instead.
2302f12 add applescript syntax_checker
da78242 add an option to SyntasticMake to specify defaults
5ca3202 Merge pull request #115 from millermedeiros/iss-sign
90e7664 balloon_eval is already being checked at the top. see #114
4b563fa Merge pull request #114 from millermedeiros/iss-sign
c95cf15 safe-guard against signs/balloons user settings when these features aren't available. see #113
8ca2028 javascript checker: make jshint 0.5.3 work
a97b9ea Merge pull request #81 from millermedeiros/master
8989818 fix a typo in the doc
7d8b7b3 add an option to disable error highlighting
bb9c873 rearrange and comment some functions
70166f4 javascript checker: make the jslint checker work again
7db6cdd Merge branch 'master' of git://github.com/scrooloose/syntastic
3defb62 php checker: add an option to disable phpcs
6b6e2d1 php checker: ignore the csv headers in the phpcs errorformat
e0ec1a3 refactor the php checker
b21ddb5 Added g:syntastic_phpcs_conf to allow phpcs flags.
b966179 Merge pull request #113 from millermedeiros/iss-sign
75a5b9a better check for balloons as well, not throwing error but no need to call RefresBalloons if it isn't supported.
8afc49d Merge branch 'master' of https://github.com/millermedeiros/syntastic
2a88c6f fix error thrown while opening vim on a environment that doesn't support signs.
6982c38 filter HTML5 warnings without using grep. see #53. see #81.
10c0c34 improve support for HTML5 attributes and refactor html.vim logic to allow adding new grep rules easily. see #53
b70a51f Added global disabling of phpcs.
966cb23 Added g:syntastic_phpcs_conf to allow phpcs flags.
1ce4d31 fix a bug with the sh checker
ae9f45c fix a small bug with the sh syntax checker and refactor
ea7d977 update the gjslint javascript checker
62ef08d make a fix to the coffee checker
af83357 fix a bug with error highlighting
975315c fix a bug where balloons werent being removed
c535a67 Merge pull request #111 from bregenspan/master
5954b5e tiny documentation addition re: generating helptags
092c7cd fix for erlang syntax checker
4ee40b2 fix a bug that was occurring with balloons
5d47955 fix a syntax error with the SyntasticCheck command
d225015 filter HTML5 warnings without using grep. see #53. see #81.
45c7759 update the header comments for version 2.0.0
d046f8e update changelog and credits
319b8f2 shift all the c helper functions into their own autoload lib file
f2b9d24 add README
0ae7112 remove the Rakefile - pathogen will be promoted from now on
aa67390 make syntastic more active by default
965b3b7 move the highlighting/balloon code into the main plugin file
6b23d63 update the doc
fc6e785 sass: remove the bufnr hacks and ignore some irrelevant output
4fbec5f move the scss checker out of the sass checker
31d3a7d trivial cosmetic code fix
5c0dbc5 init the components of syntastic_mode_map separately
295f7a5 shift the :command definitions to a common place - to be tidy
47147aa remove the old code to disable/enable filetypes
78fbd7f add g:syntastic_mode_map option
e7b8375 Merge remote-tracking branch 'justone/add_one_time_check'
3d385cf fix a bug on windows
12c9c33 fix a typo in the erlang syntax checker
950dc1a apply kTT's patch to fix the erlang syntax checker
6fab5bf Syntax checking for erlang
f428139 remove custom highlights manually - not with matchclear()
3c26740 js checker: let the user configure which checker to use
e7be510 Merge pull request #107 from zsprackett/puppet-syntax-fix
4b08887 Need this on new puppet as well
b75b836 Merge pull request #78 from sergevm/master
3be9834 Merge pull request #86 from justone/allow_non_executable_efm_perl_pl
0566720 Merge pull request #76 from lervag/master
02ab57d Merge pull request #89 from mlb-/FreeBSD_hack
67a2d99 Merge pull request #92 from roman/master
3826391 Changed the C syntax checker to use GNU99 (as opposed to GNU89). Conflicts:
d472fcc Merge pull request #85 from jimenezrick/add-gitignore
dc485b8 Merge pull request #98 from docteurklein/phpcs
1cb56c8 Add support for Zope Page Template syntax checking using zptlint
8a1f3b8 Merge pull request #104 from soli/master
e9460a0 Merge pull request #106 from zsprackett/puppet-syntax-fix
239aed5 Add --ignoreimport to puppet parse
9796022 Allow the use of flake8 instead of pyflakes to check python code
1acc40d Adds .gitignore file, useful with pathogen
d2f51c7 Merge pull request #99 from kusnier/xslt_checker
28d42b7 Merge pull request #100 from kusnier/xml_checker
7127e3c add xslt syntax checker
6c83939 add xml syntax checker
22fedb5 added phpcs support
e220e1d remove unnecessary Init() from c syntax checker
ffede31 Merge pull request #96 from sitedyno/csslint-compact-#55
de22bd1 Support new error formats in csslint 0.8.0
b921b90 Merge remote-tracking branch 'kongo/cpp_autoload'
5794f3f Merge remote-tracking branch 'kongo/c_includes'
fb4fa11 Merge pull request #94 from sitedyno/csslint-compact-#55
73519a4 Ignore lint free line.
e3cac9d Display messages for csslint.
d3317ae Modifying the syntax_checker for Haskell
09a63b2 Updating the haskell syntax checker
f4177a3 Counter-hack to provide screen redraw on FreeBSD
bb37d47 add command to force a syntastic check
612225d don't break when efm_perl.pl isn't executable
48c0b59 add possibility to add compiler options like '-std=c++0x'
d6c2591 add header include search to cpp syntax checker
fc4181c tweak autoload file
3d77ad2 move c/cpp syntax helper functions into autoload
2b7ce6c improve support for HTML5 attributes and refactor html.vim logic to allow adding new grep rules easily. see #53
6c6384a Added conditional check on Windows, and adapted makeprg so that it works correctly (tested on Windows7)
c7fd914 Added syntax checker for fortran.
bb834f3 extend default includes
c13ff43 remove debug print
f50116f c syntax checker: add doc
eb8f243 add possibility to add custom include directories

git-subtree-dir: .vim/bundle/syntastic
git-subtree-split: e5dfcc3488e407c8e28b308cb6e631336e77d060
Merge commit '2568f9f209c8ac913d9259ccd41223f1a350dcc6' into personal
new options for new syntastic

also, made puppet a passive check type
override any window title updating with $WIN_TITLE
don't add to path if we've already set the path
host-specific bash configurations
write files as root in vim
adding travis config
noop the install
adding travis status to readme
Merge branch 'master' into personal
Squashed '.vim/bundle/sideways.vim/' content from commit e40c254

git-subtree-dir: .vim/bundle/sideways.vim
git-subtree-split: e40c254ef7a09ca1c322bdd9b5c4b93218652055
Merge commit '16039389c7fdd2ad3d81298ffecffee237771a57' as '.vim/bundle/sideways.vim'
adding sideways.vim subtree info
config for sideways.vim
Squashed '.vim/bundle/linediff.vim/' content from commit 7864680

git-subtree-dir: .vim/bundle/linediff.vim
git-subtree-split: 78646801aac4d3d85e7c4e9570deccfce81a50e7
Merge commit '47c19d0a0ba090fd4282fa45ef23b709435819d3' as '.vim/bundle/linediff.vim'
adding linediff.vim subtree info
don't symlink the travis config
Merge branch 'master' into personal