diff --git a/.gitignore b/.gitignore
index ea7ccde..68ebe70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,10 @@
 *.swp
 *.swo
 cache
-pelican.pid
-srv.pid
+*.pid
+*.pyc
+output
+
+// ignore pelican path config changes in the windows build tools
+pmake.cmd
+devserver.cmd
diff --git a/README.md b/README.md
index 39c912a..8288b32 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,18 @@ run `conda env create --file environment.yml` and then
 to create and then activate a conda environment for this.
 
 ### Local editing
+
+#### Mac and Linux
 First run `PORT=8888 make devserver` and visit http://localhost:8888.
 If you are running an IPython Notebook sever, you may need to shut it down first. 
 Then, either edit an existing article in /content, or create a new one.
 for now, you can only use markdown for articles. See
 http://docs.getpelican.com/en/latest/content.html for more documentation on writing articles.
 
+#### Windows
+Correct the path to your `pelican.exe` in `pmake.cmd` and `devserver.cmd`, then
+simply
+```
+pmake html
+devserver
+```
\ No newline at end of file
diff --git a/devserver.cmd b/devserver.cmd
new file mode 100644
index 0000000..7d04e0d
--- /dev/null
+++ b/devserver.cmd
@@ -0,0 +1,56 @@
+@echo off
+REM Courtesy of https://gist.github.com/traeblain/4252511
+
+SETLOCAL EnableDelayedExpansion
+
+set _PELICAN=C:\Dev\Miniconda3\envs\blog_aei\Scripts\pelican.exe
+set _PELICANOPTS=
+
+set _BASEDIR=%cd%
+set _INPUTDIR=%_BASEDIR%/content
+set _OUTPUTDIR=%_BASEDIR%/output
+set _CONFFILE=%_BASEDIR%/pelicanconf.py
+
+set _cmmd=tasklist /FI "IMAGENAME eq python.exe" /FO CSV /NH
+
+IF EXIST %_BASEDIR%\devserver.pid (
+  echo DevServer already running...killing...
+  GOTO :killpydevserver
+)
+
+call :startpydevserver
+GOTO:EOF
+
+:startpelican
+cd %_BASEDIR%
+start %_PELICAN% --debug --autoreload -r %_INPUTDIR% -o %_OUTPUTDIR% -s %_CONFFILE% %_PELICANOPTS%
+GOTO:EOF
+
+:killpelican
+taskkill /F /T /IM pelican.exe
+GOTO:EOF
+
+:startpydevserver
+cd %_OUTPUTDIR%
+start python -m SimpleHTTPServer
+set o=
+FOR /F "tokens=2* delims=," %%G IN ('%_cmmd%') DO (
+  set /a o+=1
+  set _srvpid=%%G
+)
+echo %_srvpid:~1,-1% > %_BASEDIR%\devserver.pid
+call :startpelican
+GOTO:EOF
+
+:killpydevserver
+FOR /F %%a in ('type "%_BASEDIR%\devserver.pid"') DO (
+  echo Killing DevServer running at PID = %%a
+  taskkill /PID %%a
+)
+del %_BASEDIR%\devserver.pid
+call :killpelican
+GOTO:EOF
+
+PAUSE 10
+
+ENDLOCAL
\ No newline at end of file
diff --git a/environment.yml b/environment.yml
index deaba5a..2f22b79 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,6 +1,7 @@
 name: blog_aei
 dependencies:
 - python=2.7.9
+- pip
 - pip:
   - pelican
   - markdown
diff --git a/pmake.cmd b/pmake.cmd
new file mode 100644
index 0000000..7477507
--- /dev/null
+++ b/pmake.cmd
@@ -0,0 +1,169 @@
+@echo off
+REM Courtesy of https://gist.github.com/traeblain/4252511
+
+SETLOCAL
+
+set _PELICAN=C:\Dev\Miniconda3\envs\blog_aei\Scripts\pelican.exe
+set _PELICANOPTS=
+
+set _BASEDIR=%cd%
+set _INPUTDIR=%_BASEDIR%\content
+set _OUTPUTDIR=%_BASEDIR%\output
+set _CONFFILE=%_BASEDIR%\pelicanconf.py
+set _PUBLISHCONF=%_BASEDIR%\publishconf.py
+
+set _FTP_HOST=$ftp_host
+set _FTP_USER=$ftp_user
+set _FTP_TARGET_DIR=$ftp_target_dir
+
+set _SSH_HOST=$ssh_host
+set _SSH_PORT=$ssh_port
+set _SSH_USER=$ssh_user
+set _SSH_TARGET_DIR=$ssh_target_dir
+
+set _DROPBOX_DIR=$dropbox_dir
+
+set _DEF=%1
+set _UPLOAD=%2
+
+IF "%_DEF%"=="html" (
+  GOTO :html
+)
+IF "%_DEF%"=="clean" (
+  GOTO :clean
+)
+IF "%_DEF%"=="regenerate" (
+  GOTO :regenerate
+)
+IF "%_DEF%"=="publish" (
+  GOTO :publish
+)
+IF "%_DEF%"=="serve" (
+  GOTO :serve
+)
+IF "%_DEF%"=="devserver" (
+  GOTO :devserver
+)
+IF "%_DEF%"=="upload" (
+  GOTO :upload
+)
+IF "%_DEF%"=="help" (
+  GOTO :help
+)
+
+echo No or incorrect argument given, please review your input or type
+echo 'pmake help' for help.
+GOTO :end
+
+:help
+echo Batch file for a pelican Web site
+echo.
+echo Usage:
+echo pmake COMMAND(S)
+echo.
+echo Commands:
+echo    html                        (re)generate the web site
+echo    clean                       remove the generated files
+echo    regenerate                  regenerate files upon modification
+echo    publish                     generate using production settings
+echo    serve                       serve site at http://localhost:8000
+echo    devserver                   start/restart develop_server.sh
+echo    upload ssh                  upload the web site via SSH
+echo    upload rsync                upload the web site via rsync+ssh
+echo    upload dropbox              upload the web site via Dropbox
+echo    upload ftp                  upload the web site via FTP
+echo    upload github               upload the web site via gh-pages
+echo.
+GOTO :end
+
+:html
+echo Running Pelican to generate HTML output
+%_PELICAN% %_INPUTDIR% -o %_OUTPUTDIR% -s %_CONFFILE% %_PELICANOPTS%
+echo Done
+GOTO :end
+
+:clean
+echo Cleaning Output directory (deleting everything)
+rmdir /S %_OUTPUTDIR%
+mkdir %_OUTPUTDIR%
+GOTO :end
+
+:regenerate
+echo Running Pelican and regenerating upon file changes
+echo Press Ctrl-C to end, Y or N on batch job, either will work.
+%_PELICAN% -r %_INPUTDIR% -o %_OUTPUTDIR% -s %_CONFFILE% %_PELICANOPTS%
+GOTO :end
+
+:serve
+echo Press Ctrl-C to end the server.
+echo Then Y or N to end the batch job. Both will end it.
+cd %_OUTPUTDIR% && python -m SimpleHTTPServer
+GOTO :end
+
+:devserver
+call %_BASEDIR%/devserver.cmd
+GOTO :end
+
+:publish
+echo Generating production ready HTML
+%_PELICAN% %_INPUTDIR% -o %_OUTPUTDIR% -s %_PUBLISHCONF% %_PELICANOPTS%
+GOTO:EOF
+
+:upload
+IF "%_UPLOAD%"=="ssh" (
+  GOTO :ssh
+)
+IF "%_UPLOAD%"=="rsync" (
+  GOTO :rsync
+)
+IF "%_UPLOAD%"=="dropbox" (
+  GOTO :dropbox
+)
+IF "%_UPLOAD%"=="ftp" (
+  GOTO :ftp
+)
+IF "%_UPLOAD%"=="github" (
+  GOTO :github
+)
+
+echo No upload location given. Please provide a destination/protocol.
+echo You can use 'pmake help' to see the available options.
+GOTO :end
+
+:ssh
+echo Running Pelican and publishing output through SSH
+call :publish
+echo You must have WinSCP in your PATH variable.
+winscp.com /console /command "open scp://%_SSH_USER%@%_SSH_HOST%:%_SSH_PORT%" "option batch on" "option confirm off" "cd %_SSH_TARGET_DIR%" "put %_OUTPUTDIR%\*" "exit"
+GOTO :end
+
+:rsync
+echo Running Pelican and publishing output through Rsync
+call :publish
+echo You must have Rsync in your PATH variable.
+echo Current best Windows Rsync version located at:
+echo http://sourceforge.net/projects/sereds/files/cwRsync/4.0.5/
+set _RSYNC_OUTPUT=%_OUTPUTDIR:\=/%
+rsync.exe -e "ssh -p %_SSH_PORT%" -P -rvz --delete "/cygdrive/c%_RSYNC_OUTPUT:~2%/*" %_SSH_USER%@%_SSH_HOST%:%_SSH_TARGET_DIR%
+GOTO :end
+
+:dropbox
+echo Running Pelican and publishing output to Dropbox
+%_PELICAN% %_INPUTDIR% -o %_DROPBOX_DIR% -s %_PUBLISHCONF% %_PELICANOPTS%
+GOTO :end
+
+:ftp
+echo Running Pelican and publishing output through FTP
+call :publish
+echo You must have WinSCP in your PATH variable.
+winscp.com /console /command "open ftp://%_FTP_USER%@%_FTP_HOST%" "option batch on" "option confirm off" "cd %_FTP_TARGET_DIR%" "put %_OUTPUTDIR\*" "exit"
+GOTO :end
+
+:github
+echo Running Pelican and publishing output to Github
+call :publish
+ghp-import %_OUTPUTDIR%
+git push origin gh-pages
+
+:end
+ENDLOCAL
\ No newline at end of file